}
}
-# TODO: deal with multiple List-ID headers?
-sub inbox_for_list_id ($$) {
+sub inboxes_for_list_id ($$) {
my ($klass, $config, $simple) = @_;
# newer Email::Simple allows header_raw, as does Email::MIME:
- my $list_id = $simple->can('header_raw') ?
+ my @list_ids = $simple->can('header_raw') ?
$simple->header_raw('List-Id') :
$simple->header('List-Id');
- my $ibx;
- if (defined $list_id && $list_id =~ /<[ \t]*(.+)?[ \t]*>/) {
- $ibx = $config->lookup_list_id($1);
+ 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
}
- $ibx;
+ \@dests;
}
1;
next if $seen{"$ibx"}++;
remove_or_add($ibx, $train, $addr);
}
- my $ibx = PublicInbox::MDA->inbox_for_list_id($pi_config, $mime);
- if ($ibx && !$seen{"$ibx"}) {
+ my $dests = PublicInbox::MDA->inboxes_for_list_id($pi_config, $mime);
+ for my $ibx (@$dests) {
+ next if !$seen{"$ibx"}++;
remove_or_add($ibx, $train, $ibx->{-primary_address});
}
}
push @$dests, $ibx if $ibx;
}
if (!scalar(@$dests)) {
- my $ibx = PublicInbox::MDA->inbox_for_list_id($config, $simple);
- if (!defined($ibx) && !defined($recipient)) {
+ $dests = PublicInbox::MDA->inboxes_for_list_id($config, $simple);
+ if (!scalar(@$dests) && !defined($recipient)) {
die "ORIGINAL_RECIPIENT not defined in ENV\n";
}
- defined($ibx) or do_exit(67); # EX_NOUSER 5.1.1 user unknown
- push @$dests, $ibx;
+ scalar(@$dests) or do_exit(67); # EX_NOUSER 5.1.1 user unknown
}
my $err;
my $cur = `git --git-dir=$maindir diff HEAD~1..HEAD`;
like($cur, qr/this message would not be accepted without --no-precheck/,
'--no-precheck delivered message anyways');
+
+ # try a message with multiple List-ID headers
+ $in = <<EOF;
+List-ID: <foo.bar>
+List-ID: <$list_id>
+Message-ID: <2lids\@example>
+Subject: two List-IDs
+From: user <user\@example.com>
+To: $addr
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+EOF
+ ($out, $err) = ('', '');
+ IPC::Run::run([$mda], \$in, \$out, \$err);
+ is($?, 0, 'mda OK with multiple List-Id matches');
+ $cur = `git --git-dir=$maindir diff HEAD~1..HEAD`;
+ like($cur, qr/Message-ID: <2lids\@example>/,
+ 'multi List-ID match delivered');
+ like($err, qr/multiple List-ID/, 'warned about multiple List-ID');
}
done_testing();