Skip to content

Commit 87bf4e8

Browse files
committed
Make sure to strip possible mail header field values of whitespace before applying email.utils.unquite(). Resolution by kivinen@iki.fi, Fixes issue ietf-tools#2899.
- Legacy-Id: 17485
1 parent 1de0c2a commit 87bf4e8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ietf/doc/views_review.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ def complete_review(request, name, assignment_id=None, acronym=None):
860860

861861
list_name = mailarch.list_name_from_email(assignment.review_request.team.list_email)
862862
if list_name:
863-
review.external_url = mailarch.construct_message_url(list_name, email.utils.unquote(msg["Message-ID"]))
863+
review.external_url = mailarch.construct_message_url(list_name, email.utils.unquote(msg["Message-ID"].strip()))
864864
review.save_with_history([close_event])
865865

866866
if form.cleaned_data['email_ad'] or assignment.result in assignment.review_request.team.reviewteamsettings.notify_ad_when.all():

ietf/review/mailarch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ def retrieve_messages_from_mbox(mbox_fileobj):
9797
"splitfrom": email.utils.parseaddr(msg["From"]),
9898
"subject": msg["Subject"],
9999
"content": content.replace("\r\n", "\n").replace("\r", "\n").strip("\n"),
100-
"message_id": email.utils.unquote(msg["Message-ID"]),
101-
"url": email.utils.unquote(msg["Archived-At"]),
100+
"message_id": email.utils.unquote(msg["Message-ID"].strip()),
101+
"url": email.utils.unquote(msg["Archived-At"].strip()),
102102
"date": msg["Date"],
103103
"utcdate": (utcdate.date().isoformat(), utcdate.time().isoformat()) if utcdate else ("", ""),
104104
})

0 commit comments

Comments
 (0)