diff options
| author | Eric Wong <e@80x24.org> | 2019-10-28 10:45:20 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2019-10-30 08:48:14 +0000 |
| commit | d1525c3b35e9aa1bb14143996a7fa2b6e34cba3e (patch) | |
| tree | 1723d155c807bd01d39a929078a70c65bc3bcf77 | |
| parent | 29beb70160d15ffe46cb07e9d9468acfcda34db7 (diff) | |
| download | public-inbox-d1525c3b35e9aa1bb14143996a7fa2b6e34cba3e.tar.gz | |
It's now possible to inject false-positive ham into an inbox the same way -mda does via List-ID.
| -rw-r--r-- | lib/PublicInbox/MDA.pm | 15 | ||||
| -rw-r--r--[-rwxr-xr-x] | script/public-inbox-learn | 8 | ||||
| -rwxr-xr-x | script/public-inbox-mda | 5 |
3 files changed, 23 insertions, 5 deletions
diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm index 9cafda13..ce2c870f 100644 --- a/lib/PublicInbox/MDA.pm +++ b/lib/PublicInbox/MDA.pm @@ -83,4 +83,19 @@ sub set_list_headers { } } +# TODO: deal with multiple List-ID headers? +sub inbox_for_list_id ($$) { + my ($klass, $config, $simple) = @_; + + # newer Email::Simple allows header_raw, as does Email::MIME: + my $list_id = $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); + } + $ibx; +} + 1; diff --git a/script/public-inbox-learn b/script/public-inbox-learn index 56739f88..79f3ead5 100755..100644 --- a/script/public-inbox-learn +++ b/script/public-inbox-learn @@ -77,7 +77,7 @@ if ($train eq 'spam') { $im->done; }); } else { - require PublicInbox::MDA if $train eq "ham"; + require PublicInbox::MDA; # get all recipients my %dests; # address => <PublicInbox::Inbox|0(false)> @@ -89,10 +89,16 @@ if ($train eq 'spam') { } # n.b. message may be cross-posted to multiple public-inboxes + my %seen; while (my ($addr, $ibx) = each %dests) { next unless ref($ibx); # $ibx may be 0 + 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"}) { + remove_or_add($ibx, $train, $ibx->{-primary_address}); + } } if ($err) { diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 584218b5..3ff318c9 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -43,10 +43,7 @@ if (defined $recipient) { $dst = $config->lookup($recipient); # first check } if (!defined $dst) { - my $list_id = $simple->header('List-Id'); - if (defined $list_id && $list_id =~ /<[ \t]*(.+)?[ \t]*>/) { - $dst = $config->lookup_list_id($1); - } + $dst = PublicInbox::MDA->inbox_for_list_id($config, $simple); if (!defined $dst && !defined $recipient) { die "ORIGINAL_RECIPIENT not defined in ENV\n"; } |