X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMDA.pm;h=fe04ded9ea737d4d8788e1d4be8c1be52e9ab66a;hb=6eb73a30e5a408d5d967827e734a5acdee19495c;hp=6a984b81cfecf82108436f2a3decf358a55d4aa9;hpb=8dc8b69c617550dc1a352861aee1eeca979c8317;p=public-inbox.git

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 6a984b81..fe04ded9 100644
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -58,14 +58,27 @@ sub alias_specified {
 	return 0;
 }
 
-# RFC2919
 sub set_list_headers {
 	my ($class, $simple, $dst) = @_;
 	my $pa = $dst->{-primary_address};
-	$simple->header_set("List-Id", "<$pa>");
 
-	# prevent training loops
-	$simple->header_set('Delivered-To');
+	$simple->header_set("List-Id", "<$pa>"); # RFC2919
+
+	# remove Delivered-To: prevent training loops
+	# The rest are taken from Mailman 2.1.15, some may be used for phishing
+	foreach my $h (qw(delivered-to approved approve x-approved x-approve
+			urgent return-receipt-to disposition-notification-to
+			x-confirm-reading-to x-pmrqc)) {
+		$simple->header_set($h);
+	}
+
+	# Remove any "DomainKeys" (or similar) header lines.
+	# Any modifications (including List-Id) will cause a message
+	# to appear invalid
+	foreach my $h (qw(domainkey-signature dkim-signature
+			authentication-results)) {
+		$simple->header_set($h);
+	}
 }
 
 # returns a 3-element array: name, email, date