From: Yuri Volchkov Date: Wed, 20 Jun 2018 12:21:42 +0000 (+0200) Subject: parsemail: ignore html part of multi-part comments X-Git-Tag: v2.2.0-rc1~320 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e27ff061dc01e51967a978884a5c59152863ab9c;p=thirdparty%2Fpatchwork.git parsemail: ignore html part of multi-part comments Currently an html-protection present only for patch-emails. If a multi-part comment-email arrives, it messes up patchwork. In my case, the symptom was a non intended 'Signed-off-by' in the downloaded patches, with html-like junk. This patch makes parsemail skip all parts of comment which are not text/plain. Of course, this will drop html-only emails completely. But they can not be parsed anyways. Signed-off-by: Yuri Volchkov Reviewed-by: Stephen Finucane --- diff --git a/patchwork/parser.py b/patchwork/parser.py index 8f9af811..a40f9314 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -576,10 +576,13 @@ def find_comment_content(mail): """Extract content from a mail.""" commentbuf = '' - for payload, _ in _find_content(mail): + for payload, subtype in _find_content(mail): if not payload: continue + if subtype != 'plain': + continue + commentbuf += payload.strip() + '\n' commentbuf = clean_content(commentbuf)