update copyright headers and email addresses

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

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index d2ce79eb210fe62b52160ab5ad0b08178e98d4a6..8c2d6ed25e2301959961b9b758463e0de9fbcab7 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,10 +1,9 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 package PublicInbox::MDA;
 use strict;
 use warnings;
 use Email::Address;
-use Encode qw/decode/;
 use Date::Parse qw(strptime);
 use constant MAX_SIZE => 1024 * 500; # same as spamc default, should be tunable
 use constant cmd => qw/ssoma-mda -1/;
@@ -58,20 +57,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};
 
-       # prevent training loops
-       $simple->header_set('Delivered-To');
+       $simple->header_set("List-Id", "<$pa>"); # RFC2919
 
-       my $url = $dst->{url};
-       if (defined $url) {
-               $simple->header_set("List-Archive", "<$url>");
-               $simple->header_set("List-Help", "<${url}help>");
+       # 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);
        }
 }
 
@@ -82,9 +87,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'));
 }