fixup Plack-related requires

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

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index fe04ded9ea737d4d8788e1d4be8c1be52e9ab66a..ba5f36b09ee8b9c25f931874cc739b7bad8d4dbc 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,12 +1,14 @@
-# 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)
+#
+# For the -mda script (mail delivery agent)
 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 MAX_MID_SIZE => 244; # max term size - 1 in Xapian
 use constant cmd => qw/ssoma-mda -1/;
 
 # drop plus addressing for matching
@@ -21,6 +23,7 @@ sub precheck {
        my ($klass, $filter, $address) = @_;
        my $simple = $filter->simple;
        my $mid = $simple->header("Message-ID");
+       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(':o'), $simple->header("Subject"));
@@ -71,14 +74,6 @@ sub set_list_headers {
                        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);
-       }
 }
 
 # returns a 3-element array: name, email, date
@@ -88,9 +83,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'));
 }