diff options
author | Eric Wong <e@80x24.org> | 2015-08-27 06:41:14 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2015-08-27 06:41:14 +0000 |
commit | 5ac572c2b69470db354c6adb241e605eda19f727 (patch) | |
tree | 99ec017e4e0306e435ac06e429cce3dfbc28733f | |
parent | 3ed9085b7445fb3b7f7f5eed107dce63e4bc3bf3 (diff) | |
download | public-inbox-5ac572c2b69470db354c6adb241e605eda19f727.tar.gz |
Might as well be strict about it for new lists. Importing old archives might be more of a challenge, though.
-rw-r--r-- | lib/PublicInbox/Filter.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm index bcc57c45..0b1ec911 100644 --- a/lib/PublicInbox/Filter.pm +++ b/lib/PublicInbox/Filter.pm @@ -15,7 +15,7 @@ our $VERSION = '0.0.1'; use constant NO_HTML => '*** We only accept plain-text email, no HTML ***'; # start with the same defaults as mailman -our $BAD_EXT = qr/\.(?:exe|bat|cmd|com|pif|scr|vbs|cpl)\z/i; +our $BAD_EXT = qr/\.(exe|bat|cmd|com|pif|scr|vbs|cpl|zip)\s*\z/i; our $MIME_HTML = qr!\btext/html\b!i; our $MIME_TEXT_ANY = qr!\btext/[a-z0-9\+\._-]+\b!i; @@ -127,6 +127,7 @@ sub strip_multipart { # some extensions are just bad, reject them outright my $fn = $part->filename; if (defined($fn) && $fn =~ $BAD_EXT) { + $filter->reject("Bad file type: $1") if $filter; $rejected++; return; } @@ -150,6 +151,8 @@ sub strip_multipart { # change the sender-specified type if (recheck_type_ok($part)) { push @keep, $part; + } elsif ($filter) { + $filter->reject('no attachments') } else { $rejected++; } @@ -161,6 +164,7 @@ sub strip_multipart { push @keep, $part; } } else { + $filter->reject('no attachments') if $filter; # reject everything else, including non-PGP signatures $rejected++; } |