From: Eric Wong <e@80x24.org>
Date: Mon, 26 Jun 2017 03:05:39 +0000 (+0000)
Subject: mda: set List-ID correctly according to RFC2919
X-Git-Tag: v1.0.0~40
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=23d896234f3eb5e579de2e8ddf3c723654862ade

mda: set List-ID correctly according to RFC2919

Oops, due to an old mistake , List-ID was set incorrectly
in the MDA.  This could cause some breakage w.r.t. mail filters.
---

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/";
diff --git a/t/httpd.t b/t/httpd.t
index c2e73608..d0ce3943 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 ad50a64f..2ccc90fb 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);