use raw header for Message-ID

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

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 8c2d6ed25e2301959961b9b758463e0de9fbcab7..003bac659e6166ef73d29613ac372fc6cb382702 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,11 +1,15 @@
 # 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::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/;
 
 # drop plus addressing for matching
@@ -18,8 +22,9 @@ 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 Email::Simple $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"));
@@ -70,14 +75,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