From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1ECB32082F for ; Mon, 26 Jun 2017 03:07:33 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] mda: set List-ID correctly according to RFC2919 Date: Mon, 26 Jun 2017 03:07:33 +0000 Message-Id: <20170626030733.6069-1-e@80x24.org> List-Id: Oops, due to an old mistake , List-ID was set incorrectly in the MDA. This could cause some breakage w.r.t. mail filters. --- lib/PublicInbox/MDA.pm | 3 ++- scripts/ssoma-replay | 4 +++- t/httpd.t | 2 +- t/nntpd.t | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm index bcf5358..6490102 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 3c3fdf4..50bf456 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, was used + # as the list-Id instead of as recommended in RFC2919 + ($user, $domain) = ($list_id =~ /<([^\.@]+)[\.@](.+)>/g); if (defined $domain) { $archive_url = "https://$domain/$user/"; diff --git a/t/httpd.t b/t/httpd.t index c2e7360..d0ce394 100644 --- a/t/httpd.t +++ b/t/httpd.t @@ -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); diff --git a/t/nntpd.t b/t/nntpd.t index ad50a64..2ccc90f 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -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); -- EW