X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMDA.pm;h=f82194a347b867aa22d416b75576e3ac624527ee;hb=refs%2Fheads%2Fmaster;hp=6490102aaf8b3d52e6bcd680380a66507688fe82;hpb=23d896234f3eb5e579de2e8ddf3c723654862ade;p=public-inbox.git
diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 6490102a..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
@@ -51,8 +51,7 @@ sub usable_str {
}
sub usable_date {
- my @t = eval { strptime(@_) };
- scalar @t;
+ defined(eval { PublicInbox::MsgTime::str2date_zone($_[0]) });
}
sub alias_specified {
@@ -64,7 +63,7 @@ sub alias_specified {
} @address;
foreach my $line ($simple->header('Cc'), $simple->header('To')) {
- my @addrs = ($line =~ /([^,<\s]+\@[^,>\s]+)/g);
+ my @addrs = PublicInbox::Address::emails($line);
foreach my $addr (@addrs) {
if ($ok{lc(__drop_plus($addr))}) {
return 1;
@@ -81,8 +80,27 @@ sub set_list_headers {
$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;