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

The length of boundary lines in multipart messages could exceed 70 octets (#1795) #1809

Merged
merged 2 commits into from
Aug 25, 2024
Merged

The length of boundary lines in multipart messages could exceed 70 octets (#1795) #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb12332
The length of boundary lines in multipart messages could exceed 70 oc…
ikedas Feb 23, 2024
02fd5df
small refactoring.
ikedas Feb 24, 2024
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
28 changes: 25 additions & 3 deletions src/lib/Sympa.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,16 +767,38 @@ sub is_listmaster {
}

# Old name: tools::get_message_id().
#
# Note:
# The boundary of multipart message is generated based on this function
# and its length, 2 octets longer, should be limited up to 70 octets
# (See RFC 2046, 5.1.1). So as of 6.2.74, the length of the domain part will
# be limited. See also GH #1795.
sub unique_message_id {
my $that = shift;

my ($time, $usec) = Sympa::Tools::Time::gettimeofday();
my $domain =
(ref $that eq 'Sympa::List') ? $that->{'domain'}
: ($that and $that ne '*') ? $that
: $Conf::Conf{'domain'};
return sprintf '<sympa.%d.%d.%d.%d@%s>', $time, $usec, $PID,
(int rand 999), $domain;

my ($time, $usec) = Sympa::Tools::Time::gettimeofday();
my $base32 = sprintf '%s%s%s%s',
_base32($time, 35), _base32($usec, 20), _base32($PID, 35),
_base32(int(rand 1023), 10);

return sprintf '<sympa.%s@%s>', $base32, substr $domain, -39;
}

my @base32_alphabets = split '', '0123456789ABCDEFGHJKMNPQRSTVWXYZ';

sub _base32 {
my $dec = shift;
my $prc = shift;

# Convert a (possiblly signed) decimal $dec to binary in $prc bits
# then encode it in base32.
my $vec = substr sprintf("%0${prc}b", $dec), -$prc;
return $vec =~ s/([01]{5})/$base32_alphabets[oct "0b$1"]/egr;
}

1;
Expand Down
19 changes: 10 additions & 9 deletions src/lib/Sympa/Message/Template.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,6 @@ sub new {
$data->{'fromlist'} = Sympa::get_address($list, 'owner');
}
}
my $unique_id = Sympa::unique_message_id($robot_id);
$data->{'boundary'} = sprintf '----------=_%s', $unique_id
unless $data->{'boundary'};
$data->{'boundary1'} = sprintf '---------=1_%s', $unique_id
unless $data->{'boundary1'};
$data->{'boundary2'} = sprintf '---------=2_%s', $unique_id
unless $data->{'boundary2'};

my $self = $class->_new_from_template($that, $tpl . '.tt2',
$who, $data, %options);
Expand Down Expand Up @@ -271,6 +264,15 @@ sub _new_from_template {
die sprintf 'Wrong type of reference for $rcpt: %s', ref $rcpt
if ref $rcpt and ref $rcpt ne 'ARRAY';

# Boundaries for multipart message.
my $unique_id = Sympa::unique_message_id($robot_id);
$data->{'boundary'} = sprintf '=_%s', $unique_id
unless $data->{'boundary'};
$data->{'boundary1'} = sprintf '=1%s', $unique_id
unless $data->{'boundary1'};
$data->{'boundary2'} = sprintf '=2%s', $unique_id
unless $data->{'boundary2'};

## Charset for encoding
$data->{'charset'} ||= Conf::lang2charset($data->{'lang'});

Expand Down Expand Up @@ -327,8 +329,7 @@ sub _new_from_template {
my $headers = "";

unless ($header_ok{'message-id'}) {
$headers .=
sprintf("Message-Id: %s\n", Sympa::unique_message_id($robot_id));
$headers .= sprintf("Message-Id: %s\n", $unique_id);
}

unless ($header_ok{'date'}) {
Expand Down
Loading