Bug 1837680: Add Message-ID header when missing at send#146
Merged
Conversation
Member
|
GitHub isn't very good with messaging... the force-push was rebasing this PR on top of the target branch since there's been a bunch of upstream changes since it was filed. |
justdave
requested changes
Jun 21, 2026
justdave
left a comment
justdave
left a comment
Member
There was a problem hiding this comment.
The review comments from bugzilla/bugzilla#205 also apply here.
Contributor
Author
|
Rebased, fixes for comments applied and unit test added. |
mrenvoize
force-pushed
the
bug_1837680
branch
3 times, most recently
from
1f79550 to
29db591
Compare
Contributor
Author
|
I've lost track.. is there anything outstanding here? |
justdave
requested changes
Jul 6, 2026
justdave
left a comment
justdave
left a comment
Member
There was a problem hiding this comment.
I've lost track.. is there anything outstanding here?
I just added some review comments on the 5.2 PR which probably apply here as well.
Detect whether a Message-ID header has been included in the message passed to MessageToMTA and generate one if it's missing. GMail and other modern mail services now expect a Message-ID as part of the message else they mark them as spam or drop them entirely.
Bugzilla->params->{'urlbase'} has been moved to Bugzilla->localconfig->urlbase
Signed-off-by: Kan-Ru Chen <kanru@kanru.info>
- Strip path components from urlbase when building sitespec, as '/' is illegal after '@' in a Message-ID (affects both build_thread_marker and build_message_id) - Fix stale $2 capture variable risk by conditioning port relocation on the substitution succeeding, in both functions - Avoid falling back to Bugzilla->user->id in build_message_id, which is called from contexts with no logged-in user; random bits ensure uniqueness without a user identifier
- Remove trailing whitespace from the spam-guard comment and blank line - Omit the user_id segment entirely when absent rather than producing a double-dash (bugzilla--rand@domain), giving bugzilla-rand@domain
Test the sitespec transformation for four urlbase forms (plain, with path, with port, with port+path) to guard against regressions in the '/' stripping and port relocation logic. Also covers user_id handling in build_message_id (present, absent, no double-dash).
Stripping the path from urlbase loses information: two independent Bugzilla installs hosted in different subdirectories of the same domain (e.g. /team-a/ and /team-b/) would produce identical sitespecs, letting mail clients that group by References/In-Reply-To/Message-ID cross-thread unrelated bugs from separate installations. Relocate the path in front of the domain instead, the same way the port number is already relocated, sanitizing any internal '/' since it's illegal in a domain. Updates build_thread_marker and build_message_id identically, plus the corresponding tests.
Contributor
Author
|
Follow-up Pushed |
justdave
approved these changes
Jul 11, 2026
justdave
left a comment
justdave
left a comment
Member
There was a problem hiding this comment.
Fixes look good. I wasn't expecting subdir and port to end up on the front side of the @ but that's legal and works for me. :-)
justdave
requested changes
Jul 11, 2026
justdave
approved these changes
Jul 11, 2026
justdave
left a comment
justdave
left a comment
Member
There was a problem hiding this comment.
Looks good with that cleared up.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Detect whether a Message-ID header has been included in the message passed to MessageToMTA and generate one if it's missing.
GMail and other modern mail services now expect a Message-ID as part of the message else they mark them as spam or drop them entirely.
** This is a port of the same bug fix submitted for Bugzilla 5.2 **