mda: precheck no longer depends on Email::Filter

Email::Filter doesn't offer any functionality we need, here;
and our dependency on Email::Filter will gradually be removed
since it (and Email::LocalDelivery) seem abandoned and we
can have more-fine-grained control by rolling our own Maildir
delivery which can work transactionally.

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 2e6e9ec5a1e55c509f7690d5eea5edd8d5ce1bfe..0f583e65a6a2fb3473f4873fe766d42f523a0eb0 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -32,18 +32,17 @@ sub __drop_plus {
 
 # do not allow Bcc, only Cc and To if recipient is set
 sub precheck {
-       my ($klass, $filter, $address) = @_;
-       my Email::Simple $simple = $filter->simple;
+       my ($klass, $simple, $address) = @_;
        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('<m@h>'), $mid) && $mid =~ /\@/;
-       return 0 unless usable_str(length('u@h'), $filter->from);
+       return 0 unless usable_str(length('u@h'), $simple->header("From"));
        return 0 unless usable_str(length(':o'), $simple->header("Subject"));
        return 0 unless usable_date($simple->header("Date"));
        return 0 if length($simple->as_string) > MAX_SIZE;
-       alias_specified($filter, $address);
+       alias_specified($simple, $address);
 }
 
 sub usable_str {
@@ -57,14 +56,14 @@ sub usable_date {
 }
 
 sub alias_specified {
-       my ($filter, $address) = @_;
+       my ($simple, $address) = @_;
 
        my @address = ref($address) eq 'ARRAY' ? @$address : ($address);
        my %ok = map {
                lc(__drop_plus($_)) => 1;
        } @address;
 
-       foreach my $line ($filter->cc, $filter->to) {
+       foreach my $line ($simple->header('Cc'), $simple->header('To')) {
                my @addrs = ($line =~ /([^<\s]+\@[^>\s]+)/g);
                foreach my $addr (@addrs) {
                        if ($ok{lc(__drop_plus($addr))}) {

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 84219ac3c2531dcd9cbc98800b7e42f673d6ed2a..ff2835dac987c086720c6cf476335e8a9c8ff05c 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -34,7 +34,7 @@ defined $dst or exit(1);
 my $main_repo = $dst->{mainrepo} or exit(1);
 my $filtered; # string dest
 
-if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
+if (PublicInbox::MDA->precheck($filter->simple, $dst->{address}) &&
     do_spamc($filter->simple, \$filtered)) {
        # update our message with SA headers (in case our filter rejects it)
        my $msg = Email::MIME->new(\$filtered);

diff --git a/t/precheck.t b/t/precheck.t
index 3f2c5d5b76230dab8bee16128da41ddc607d9cab..6c353d8d8ccf5d2df38f9f1a82b0fb1547078786 100644 (file)
--- a/t/precheck.t
+++ b/t/precheck.t
@@ -4,28 +4,25 @@ use strict;
 use warnings;
 use Test::More;
 use Email::Simple;
-use Email::Filter;
 use PublicInbox::MDA;
 
 sub do_checks {
        my ($s) = @_;
 
-       my $f = Email::Filter->new(data => $s->as_string);
-
        my $recipient = 'foo@example.com';
-       ok(!PublicInbox::MDA->precheck($f, $recipient),
+       ok(!PublicInbox::MDA->precheck($s, $recipient),
                "wrong ORIGINAL_RECIPIENT rejected");
 
        $recipient = 'b@example.com';
-       ok(PublicInbox::MDA->precheck($f, $recipient),
+       ok(PublicInbox::MDA->precheck($s, $recipient),
                "ORIGINAL_RECIPIENT in To: is OK");
 
        $recipient = 'c@example.com';
-       ok(PublicInbox::MDA->precheck($f, $recipient),
+       ok(PublicInbox::MDA->precheck($s, $recipient),
                "ORIGINAL_RECIPIENT in Cc: is OK");
 
        $recipient = [ 'c@example.com', 'd@example.com' ];
-       ok(PublicInbox::MDA->precheck($f, $recipient),
+       ok(PublicInbox::MDA->precheck($s, $recipient),
                "alias list is OK");
 }
 
@@ -72,8 +69,7 @@ sub do_checks {
                ],
                body => "hello world\n",
        );
-       my $f = Email::Filter->new(data => $s->as_string);
-       ok(!PublicInbox::MDA->precheck($f, $recipient),
+       ok(!PublicInbox::MDA->precheck($s, $recipient),
                "missing From: is rejected");
 }