Skip to content

Bug 1837680: Add Message-ID header when missing at send #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bug 1837680: Add Message-ID header when missing at send #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Bugzilla/Mailer.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ sub MessageToMTA {
$email->header_set('MIME-Version', '1.0')
if !$email->header('MIME-Version');

# We ensure there's a Message-ID header set otherwise some mailsystems
# treat us as spam.
$email->header_set('Message-ID', build_message_id())
if !$email->header('Message-ID');

# Encode the headers correctly in quoted-printable
foreach my $header ($email->header_names) {
$header = lc $header;
Expand Down Expand Up @@ -270,4 +275,23 @@ sub build_thread_marker {
return $threadingmarker;
}

# Builds Message-ID header
sub build_message_id {
my ($user_id) = @_;

if (!defined $user_id) {
$user_id = Bugzilla->user->id;
}

my $sitespec = '@' . Bugzilla->params->{'urlbase'};
$sitespec =~ s/:\/\//\./; # Make the protocol look like part of the domain
$sitespec =~ s/^([^:\/]+):(\d+)/$1/; # Remove a port number, to relocate
if ($2) {
$sitespec = "-$2$sitespec"; # Put the port number back in, before the '@'
}

my $rand_bits = generate_random_password(10);
my $message_id = "<bugzilla-$user_id-$rand_bits$sitespec>";
return $message_id;
}
1;
Loading