From 87bf4e8d585364100d5b44763e82c9105f925bb1 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 21 Mar 2020 17:34:37 +0000 Subject: [PATCH] Make sure to strip possible mail header field values of whitespace before applying email.utils.unquite(). Resolution by kivinen@iki.fi, Fixes issue #2899. - Legacy-Id: 17485 --- ietf/doc/views_review.py | 2 +- ietf/review/mailarch.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 01a0606a4..4e4db5efe 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -860,7 +860,7 @@ def complete_review(request, name, assignment_id=None, acronym=None): list_name = mailarch.list_name_from_email(assignment.review_request.team.list_email) if list_name: - review.external_url = mailarch.construct_message_url(list_name, email.utils.unquote(msg["Message-ID"])) + review.external_url = mailarch.construct_message_url(list_name, email.utils.unquote(msg["Message-ID"].strip())) review.save_with_history([close_event]) if form.cleaned_data['email_ad'] or assignment.result in assignment.review_request.team.reviewteamsettings.notify_ad_when.all(): diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py index 0fbf893e0..e391cee70 100644 --- a/ietf/review/mailarch.py +++ b/ietf/review/mailarch.py @@ -97,8 +97,8 @@ def retrieve_messages_from_mbox(mbox_fileobj): "splitfrom": email.utils.parseaddr(msg["From"]), "subject": msg["Subject"], "content": content.replace("\r\n", "\n").replace("\r", "\n").strip("\n"), - "message_id": email.utils.unquote(msg["Message-ID"]), - "url": email.utils.unquote(msg["Archived-At"]), + "message_id": email.utils.unquote(msg["Message-ID"].strip()), + "url": email.utils.unquote(msg["Archived-At"].strip()), "date": msg["Date"], "utcdate": (utcdate.date().isoformat(), utcdate.time().isoformat()) if utcdate else ("", ""), })