From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] filter: reject bad attachments outright
Date: Thu, 27 Aug 2015 07:03:14 +0000 [thread overview]
Message-ID: <1440658994-20677-1-git-send-email-e@80x24.org> (raw)
Might as well be strict about it for new lists.
Importing old archives might be more of a challenge, though.
---
lib/PublicInbox/Filter.pm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm
index bcc57c4..0b1ec91 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++;
}
--
EW
reply other threads:[~2015-08-27 7:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440658994-20677-1-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).