* [PATCH 3/3] filter: more consistent labeling of rejections
2015-10-01 22:21 6% [PATCH 0/3] mda cleanups for idiotic mail policies Eric Wong
@ 2015-10-01 22:23 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-10-01 22:23 UTC (permalink / raw)
To: meta
While we're at it, reject non-plain-text top-level messages,
too. They probably do not exist in practice, but we cannot
afford to scrub given policies implemented by overzealous
mail providers.
While we're at it, update the comment for strip_multipart.
---
lib/PublicInbox/Filter.pm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm
index 6f28e01..01052d0 100644
--- a/lib/PublicInbox/Filter.pm
+++ b/lib/PublicInbox/Filter.pm
@@ -13,6 +13,7 @@ use Email::Filter;
use IPC::Run;
our $VERSION = '0.0.1';
use constant NO_HTML => '*** We only accept plain-text email, no HTML ***';
+use constant TEXT_ONLY => '*** We only accept plain-text email ***';
# start with the same defaults as mailman
our $BAD_EXT = qr/\.(exe|bat|cmd|com|pif|scr|vbs|cpl|zip)\s*\z/i;
@@ -49,6 +50,7 @@ sub run {
} elsif ($content_type =~ m!\bmultipart/!i) {
return strip_multipart($mime, $content_type, $filter);
} else {
+ $filter->reject(TEXT_ONLY) if $filter;
replace_body($mime, "$content_type message scrubbed");
return 0;
}
@@ -108,10 +110,7 @@ sub dump_html {
}
}
-# this is to correct user errors and not expected to cover all corner cases
-# if users don't want to hit this, they should be sending text/plain messages
-# unfortunately, too many people send HTML mail and we'll attempt to convert
-# it to something safer, smaller and harder-to-spy-on-users-with.
+# this is to correct old archives during import.
sub strip_multipart {
my ($mime, $content_type, $filter) = @_;
@@ -152,7 +151,7 @@ sub strip_multipart {
if (recheck_type_ok($part)) {
push @keep, $part;
} elsif ($filter) {
- $filter->reject('no attachments')
+ $filter->reject(TEXT_ONLY);
} else {
$rejected++;
}
@@ -164,7 +163,7 @@ sub strip_multipart {
push @keep, $part;
}
} else {
- $filter->reject('no attachments') if $filter;
+ $filter->reject(TEXT_ONLY) if $filter;
# reject everything else, including non-PGP signatures
$rejected++;
}
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] mda cleanups for idiotic mail policies
@ 2015-10-01 22:21 6% Eric Wong
2015-10-01 22:23 7% ` [PATCH 3/3] filter: more consistent labeling of rejections Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2015-10-01 22:21 UTC (permalink / raw)
To: meta
Hopefully these will make things easier for folks on mail hosts
like Yahoo which implement horrible DMARC policies to prevent
mailing lists from working properly.
ref: http://mid.gmane.org/20150911225542.GA1225@survex.com
Eric Wong (3):
mda: keep DKIM crap
filter: do not strip Reply-To
filter: more consistent labeling of rejections
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-10-01 22:21 6% [PATCH 0/3] mda cleanups for idiotic mail policies Eric Wong
2015-10-01 22:23 7% ` [PATCH 3/3] filter: more consistent labeling of rejections Eric Wong
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).