X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMDA.pm;h=2e6e9ec5a1e55c509f7690d5eea5edd8d5ce1bfe;hb=23a4e44bedabe5b8b651346cabc2a870c5377a30;hp=25d6ae556eb7bfc09f33c03e695630bb7c7b08cb;hpb=a9534e6b5cfdc9b59de3311e334b85c84a90d246;p=public-inbox.git
diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 25d6ae55..2e6e9ec5 100644
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,12 +1,27 @@
# Copyright (C) 2013-2015 all contributors
# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+#
+# For the -mda script (mail delivery agent)
package PublicInbox::MDA;
use strict;
use warnings;
-use Email::Address;
+use Email::Simple;
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/;
+use constant MAX_MID_SIZE => 244; # max term size - 1 in Xapian
+
+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 {
@@ -18,8 +33,11 @@ sub __drop_plus {
# do not allow Bcc, only Cc and To if recipient is set
sub precheck {
my ($klass, $filter, $address) = @_;
- my $simple = $filter->simple;
- my $mid = $simple->header("Message-ID");
+ my Email::Simple $simple = $filter->simple;
+ my @mid = $simple->header('Message-ID');
+ return 0 if scalar(@mid) != 1;
+ my $mid = $mid[0];
+ return 0 if (length($mid) > MAX_MID_SIZE);
return 0 unless usable_str(length(''), $mid) && $mid =~ /\@/;
return 0 unless usable_str(length('u@h'), $filter->from);
return 0 unless usable_str(length(':o'), $simple->header("Subject"));
@@ -43,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;
}
}
@@ -59,28 +77,12 @@ sub alias_specified {
sub set_list_headers {
my ($class, $simple, $dst) = @_;
- my $pa = $dst->{-primary_address};
-
- $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);
+ unless (defined $simple->header('List-Id')) {
+ my $pa = $dst->{-primary_address};
+ $simple->header_set("List-Id", "<$pa>"); # RFC2919
}
-}
-
-# 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;