diff options
author | Eric Wong <e@80x24.org> | 2017-06-26 03:05:39 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2017-06-26 03:07:46 +0000 |
commit | 23d896234f3eb5e579de2e8ddf3c723654862ade (patch) | |
tree | fd7812a146f847bae43139ccceb1ee5e35dc72d9 | |
parent | dfdaf74a2ab6d694315d8f636e3771a7a7934f3f (diff) | |
download | public-inbox-23d896234f3eb5e579de2e8ddf3c723654862ade.tar.gz |
Oops, due to an old mistake , List-ID was set incorrectly in the MDA. This could cause some breakage w.r.t. mail filters.
-rw-r--r-- | lib/PublicInbox/MDA.pm | 3 | ||||
-rwxr-xr-x | scripts/ssoma-replay | 4 | ||||
-rw-r--r-- | t/httpd.t | 2 | ||||
-rw-r--r-- | t/nntpd.t | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm index bcf5358b..6490102a 100644 --- a/lib/PublicInbox/MDA.pm +++ b/lib/PublicInbox/MDA.pm @@ -78,7 +78,8 @@ sub set_list_headers { my ($class, $simple, $dst) = @_; unless (defined $simple->header('List-Id')) { my $pa = $dst->{-primary_address}; - $simple->header_set("List-Id", "<$pa>"); # RFC2919 + $pa =~ tr/@/./; # RFC2919 + $simple->header_set("List-Id", "<$pa>"); } $simple->header_set($_) foreach @BAD_HEADERS; diff --git a/scripts/ssoma-replay b/scripts/ssoma-replay index 3c3fdf48..50bf4560 100755 --- a/scripts/ssoma-replay +++ b/scripts/ssoma-replay @@ -45,7 +45,9 @@ my $body = $msg->body; my $list_id = $header_obj->header('List-Id'); my ($archive_url, $user, $domain); if (defined $list_id) { - ($user, $domain) = ($list_id =~ /<(.+)\@(.+)>/g); + # due to a bug in old versions of public-inbox, <user@domain> was used + # as the list-Id instead of <user.domain> as recommended in RFC2919 + ($user, $domain) = ($list_id =~ /<([^\.@]+)[\.@](.+)>/g); if (defined $domain) { $archive_url = "https://$domain/$user/"; @@ -57,7 +57,7 @@ Date: Thu, 01 Jan 1970 06:06:06 +0000 nntp EOF - $mime->header_set('List-Id', "<$addr>"); + my $git = PublicInbox::Git->new($maindir); my $im = PublicInbox::Import->new($git, 'test', $addr); $im->add($mime); @@ -62,7 +62,9 @@ Content-Transfer-Encoding: 8bit This is a test message for El\xc3\xa9anor EOF - $mime->header_set('List-Id', "<$addr>"); + my $list_id = $addr; + $list_id =~ s/@/./; + $mime->header_set('List-Id', "<$list_id>"); $len = length($mime->as_string); my $git = PublicInbox::Git->new($maindir); my $im = PublicInbox::Import->new($git, 'test', $addr); |