cleanup Email::Address usage

[public-inbox.git] / lib / PublicInbox / MDA.pm

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index e2b2f9143083c0b1979d283fda7d2b985096e9a9..16da7afac2bb8a6f357f57b79db41bf8c86911af 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -58,17 +58,26 @@ sub alias_specified {
        return 0;
 }
 
-# RFC2919 and RFC2369
 sub set_list_headers {
        my ($class, $simple, $dst) = @_;
-       my $pa = "<$dst->{-primary_address}>";
-       $simple->header_set("List-Id", $pa);
-       $simple->header_set("List-Post", $pa);
+       my $pa = $dst->{-primary_address};
 
-       my $url = $dst->{url};
-       if (defined $url) {
-               $simple->header_set("List-Archive", "<$url>");
-               $simple->header_set("List-Help", "<${url}help>");
+       $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);
        }
 }
 
@@ -79,9 +88,7 @@ sub author_info {
        my $from = $mime->header('From');
        my @from = Email::Address->parse($from);
        my $name = $from[0]->name;
-       defined $name or $name = '';
        my $email = $from[0]->address;
-       defined $email or $email = '';
        ($name, $email, $mime->header('Date'));
 }