From 0f481af87d4dfca6599eac74690f8624025c80f6 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 17 Jun 2016 17:47:59 +0000 Subject: filter/base: reject more types by default Try to be descriptive for some of these. --- lib/PublicInbox/Filter/Base.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/Filter/Base.pm b/lib/PublicInbox/Filter/Base.pm index 37f1ee7e..b2bb1462 100644 --- a/lib/PublicInbox/Filter/Base.pm +++ b/lib/PublicInbox/Filter/Base.pm @@ -8,11 +8,14 @@ use warnings; use PublicInbox::MsgIter; use constant MAX_MID_SIZE => 244; # max term size - 1 in Xapian -my $NO_HTML = '*** We only accept plain-text mail, no HTML ***'; +sub No ($) { "*** We only accept plain-text mail, No $_[0] ***" } + our %DEFAULTS = ( - reject_suffix => [ qw(exe bat cmd com pif scr vbs cpl zip) ], - reject_type => [ "text/html:$NO_HTML", "text/xhtml:$NO_HTML", - 'application/vnd.ms-*:No proprietary data formats' ], + reject_suffix => [ qw(exe bat cmd com pif scr vbs cpl zip swf swfl) ], + reject_type => [ 'text/html:'.No('HTML'), 'text/xhtml:'.No('HTML'), + 'application/vnd.*:'.No('vendor-specific formats'), + 'image/*:'.No('images'), 'video/*:'.No('video'), + 'audio/*:'.No('audio') ], ); our $INVALID_FN = qr/\0/; -- cgit v1.2.3-24-ge0c7