From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] filter: fix handling of bad attachments
Date: Thu, 15 Oct 2015 18:32:40 +0000 [thread overview]
Message-ID: <20151015183240.17440-1-e@80x24.org> (raw)
Improve error messages and use a better regexp for detecting
printable characters in attachments.
---
lib/PublicInbox/Filter.pm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm
index 01052d0..82baa9b 100644
--- a/lib/PublicInbox/Filter.pm
+++ b/lib/PublicInbox/Filter.pm
@@ -151,7 +151,8 @@ sub strip_multipart {
if (recheck_type_ok($part)) {
push @keep, $part;
} elsif ($filter) {
- $filter->reject(TEXT_ONLY);
+ $filter->reject("Bad attachment: $part_type ".
+ TEXT_ONLY);
} else {
$rejected++;
}
@@ -162,8 +163,10 @@ sub strip_multipart {
if ($rejected == 0 && !@html) {
push @keep, $part;
}
+ } elsif ($filter) {
+ $filter->reject("unacceptable mime-type: $part_type ".
+ TEXT_ONLY);
} else {
- $filter->reject(TEXT_ONLY) if $filter;
# reject everything else, including non-PGP signatures
$rejected++;
}
@@ -232,8 +235,7 @@ sub replace_body {
sub recheck_type_ok {
my ($part) = @_;
my $s = $part->body;
- ((length($s) < 0x10000) &&
- ($s =~ /\A([\P{XPosixPrint}\f\n\r\t]+)\z/))
+ ((length($s) < 0x10000) && ($s =~ /\A([[:print:]\s]+)\z/s));
}
1;
--
EW
reply other threads:[~2015-10-15 18:32 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=20151015183240.17440-1-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).