X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMDA.pm;h=33696528f8c1468e8b2b05d597df4e84675c21cd;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=b1471022121d2743d4bcca120f9254a90be4c4fa;hpb=fe3d2447badd595df784541556311137b920b0a2;p=public-inbox.git

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index b1471022..33696528 100644
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,16 +1,28 @@
-# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <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 PublicInbox::MsgTime;
 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
 
+our @BAD_HEADERS = (
+	# postfix
+	qw(delivered-to x-original-to), # prevent training loops
+
+	# The rest are taken from Mailman 2.1.15:
+	# could contain passwords:
+	qw(approved approve x-approved x-approve urgent),
+	# could be used phishing:
+	qw(return-receipt-to disposition-notification-to x-confirm-reading-to),
+	# Pegasus mail:
+	qw(x-pmrqc)
+);
+
 # drop plus addressing for matching
 sub __drop_plus {
 	my ($str_addr) = @_;
@@ -20,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 {
@@ -40,22 +51,21 @@ 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 {
-		my @recip = Email::Address->parse($_);
-		lc(__drop_plus($recip[0]->address)) => 1;
+		lc(__drop_plus($_)) => 1;
 	} @address;
 
-	foreach my $line ($filter->cc, $filter->to) {
-		foreach my $addr (Email::Address->parse($line)) {
-			if ($ok{lc(__drop_plus($addr->address))}) {
+	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))}) {
 				return 1;
 			}
 		}
@@ -67,20 +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>");
 	}
+}
 
-	foreach my $h (qw(delivered-to), # prevent training loops
-			# The rest are taken from Mailman 2.1.15
-			# could contain passwords:
-			qw(approved approve x-approved x-approve urgent),
-			# could be used phishing:
-			qw(return-receipt-to disposition-notification-to
-			   x-confirm-reading-to),
-			# Pegasus mail:
-			qw(x-pmrqc)) {
-		$simple->header_set($h);
+sub inboxes_for_list_id ($$) {
+	my ($klass, $config, $simple) = @_;
+
+	# 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 = $config->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;