remove Email::Address dependency

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

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 2d3b9bd8daa3bba761a1980c55e38d9063c4a243..2e6e9ec5a1e55c509f7690d5eea5edd8d5ce1bfe 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -6,11 +6,22 @@ package PublicInbox::MDA;
 use strict;
 use warnings;
 use Email::Simple;
-use Email::Address;
 use Date::Parse qw(strptime);
 use constant MAX_SIZE => 1024 * 500; # same as spamc default, should be tunable
 use constant MAX_MID_SIZE => 244; # max term size - 1 in Xapian
-use constant cmd => qw/ssoma-mda -1/;
+
+our @BAD_HEADERS = (
+       # postfix
+       qw(delivered-to x-original-to), # prevent training loops
+
+       # The rest are taken from Mailman 2.1.15:
+       # could contain passwords:
+       qw(approved approve x-approved x-approve urgent),
+       # could be used phishing:
+       qw(return-receipt-to disposition-notification-to x-confirm-reading-to),
+       # Pegasus mail:
+       qw(x-pmrqc)
+);
 
 # drop plus addressing for matching
 sub __drop_plus {
@@ -50,13 +61,13 @@ sub alias_specified {
 
        my @address = ref($address) eq 'ARRAY' ? @$address : ($address);
        my %ok = map {
-               my @recip = Email::Address->parse($_);
-               lc(__drop_plus($recip[0]->address)) => 1;
+               lc(__drop_plus($_)) => 1;
        } @address;
 
        foreach my $line ($filter->cc, $filter->to) {
-               foreach my $addr (Email::Address->parse($line)) {
-                       if ($ok{lc(__drop_plus($addr->address))}) {
+               my @addrs = ($line =~ /([^<\s]+\@[^>\s]+)/g);
+               foreach my $addr (@addrs) {
+                       if ($ok{lc(__drop_plus($addr))}) {
                                return 1;
                        }
                }
@@ -71,28 +82,7 @@ sub set_list_headers {
                $simple->header_set("List-Id", "<$pa>"); # RFC2919
        }
 
-       foreach my $h (qw(delivered-to), # prevent training loops
-                       # The rest are taken from Mailman 2.1.15
-                       # could contain passwords:
-                       qw(approved approve x-approved x-approve urgent),
-                       # could be used phishing:
-                       qw(return-receipt-to disposition-notification-to
-                          x-confirm-reading-to),
-                       # Pegasus mail:
-                       qw(x-pmrqc)) {
-               $simple->header_set($h);
-       }
-}
-
-# returns a 3-element array: name, email, date
-sub author_info {
-       my ($class, $mime) = @_;
-
-       my $from = $mime->header('From');
-       my @from = Email::Address->parse($from);
-       my $name = $from[0]->name;
-       my $email = $from[0]->address;
-       ($name, $email, $mime->header('Date'));
+       $simple->header_set($_) foreach @BAD_HEADERS;
 }
 
 1;