X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMDA.pm;h=f82194a347b867aa22d416b75576e3ac624527ee;hb=refs%2Fheads%2Fmaster;hp=2e6e9ec5a1e55c509f7690d5eea5edd8d5ce1bfe;hpb=23a4e44bedabe5b8b651346cabc2a870c5377a30;p=public-inbox.git
diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 2e6e9ec5..f82194a3 100644
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,12 +1,12 @@
-# Copyright (C) 2013-2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2021 all contributors
+# License: AGPL-3.0+
#
# For the -mda script (mail delivery agent)
package PublicInbox::MDA;
use strict;
use warnings;
-use Email::Simple;
-use Date::Parse qw(strptime);
+use PublicInbox::MsgTime;
+use PublicInbox::Address;
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
@@ -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(''), $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 {
@@ -52,20 +51,19 @@ sub usable_str {
}
sub usable_date {
- my @t = eval { strptime(@_) };
- scalar @t;
+ defined(eval { PublicInbox::MsgTime::str2date_zone($_[0]) });
}
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) {
- my @addrs = ($line =~ /([^<\s]+\@[^>\s]+)/g);
+ foreach my $line ($simple->header('Cc'), $simple->header('To')) {
+ my @addrs = PublicInbox::Address::emails($line);
foreach my $addr (@addrs) {
if ($ok{lc(__drop_plus($addr))}) {
return 1;
@@ -79,10 +77,30 @@ sub set_list_headers {
my ($class, $simple, $dst) = @_;
unless (defined $simple->header('List-Id')) {
my $pa = $dst->{-primary_address};
- $simple->header_set("List-Id", "<$pa>"); # RFC2919
+ $pa =~ tr/@/./; # RFC2919
+ $simple->header_set("List-Id", "<$pa>");
}
+}
+
+sub inboxes_for_list_id ($$) {
+ my ($klass, $pi_cfg, $simple) = @_;
- $simple->header_set($_) foreach @BAD_HEADERS;
+ # newer Email::Simple allows header_raw, as does Email::MIME:
+ my @list_ids = $simple->can('header_raw') ?
+ $simple->header_raw('List-Id') :
+ $simple->header('List-Id');
+ my @dests;
+ for my $list_id (@list_ids) {
+ $list_id =~ /<[ \t]*(.+)?[ \t]*>/ or next;
+ if (my $ibx = $pi_cfg->lookup_list_id($1)) {
+ push @dests, $ibx;
+ }
+ }
+ if (scalar(@list_ids) > 1) {
+ warn "W: multiple List-IDs in message:\n";
+ warn "W: List-ID: $_\n" for @list_ids
+ }
+ \@dests;
}
1;