mda: keep DKIM crap

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

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 6a984b81cfecf82108436f2a3decf358a55d4aa9..25d6ae556eb7bfc09f33c03e695630bb7c7b08cb 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,14 +57,19 @@ 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);
+       }
 }
 
 # returns a 3-element array: name, email, date
@@ -75,9 +79,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'));
 }