From: Eric Wong <e@80x24.org>
Date: Thu, 10 Sep 2015 00:59:08 +0000 (+0000)
Subject: constent X?HTML MIME type filtering
X-Git-Tag: v1.0.0~893
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=aad65bb344ebca758940e1129b5604aba1e20eee;hp=4ba45db831ccc8388630596596e49a52f5c2681b;p=public-inbox.git

constent X?HTML MIME type filtering

Filter and View should reject X?HTML the same way.
---

diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm
index 5a023cf7..84df0e7d 100644
--- a/lib/PublicInbox/Filter.pm
+++ b/lib/PublicInbox/Filter.pm
@@ -16,7 +16,7 @@ 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|zip)\s*\z/i;
-our $MIME_HTML = qr!\btext/html\b!i;
+our $MIME_HTML = qr!\btext/x?html\b!i;
 our $MIME_TEXT_ANY = qr!\btext/[a-z0-9\+\._-]+\b!i;
 
 # this is highly opinionated delivery
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 5baca972..9f87546f 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -353,7 +353,7 @@ sub add_text_body {
 
 	my $ct = $part->content_type;
 	# account for filter bugs...
-	if (defined $ct && $ct =~ m!\btext/[xh]+tml\b!i) {
+	if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
 		$part->body_set('');
 		return '';
 	}