Skip to content
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

dkim_sign: Normalize CRLF->LF for DKIM-Signature #588

Merged
merged 1 commit into from
Apr 13, 2019
Merged

dkim_sign: Normalize CRLF->LF for DKIM-Signature #588

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
12 changes: 11 additions & 1 deletion src/lib/Sympa/Message.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,20 @@ sub dkim_sign {
my ($dummy, $new_body) = split /\r\n\r\n/, $msg_as_string, 2;
$new_body =~ s/\r\n/\n/g;

# Mail::DKIM::Signer wraps DKIM-Signature with with \r\n\t; this
# is the hardcoded Separator passed to Mail::DKIM::TextWrap via
# Mail::DKIM::KeyValueList. MIME::Tools on the other hand
# (MIME::Head::stringify() in particular) encode EOL as plain \n;
# so it is necessary to normalize CRLF->LF for DKIM-Signature to
# avoid confusing the mail agent.

my $dkim_signature = $dkim->signature->as_string;
$dkim_signature =~ s/\r\n/\n/g;

# Signing is done. Rebuilding message as string with original body
# and new headers.
# Note that DKIM-Signature: field should be prepended to the header.
$self->add_header('DKIM-Signature', $dkim->signature->as_string, 0);
$self->add_header('DKIM-Signature', $dkim_signature, 0);
$self->{_body} = $new_body;
delete $self->{_entity_cache}; # Clear entity cache.

Expand Down