From 2af63c66c9ea09df6c6eab285618c75372eff1ff Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 1 Jun 2016 12:50:39 +0200
Subject: [PATCH] Properly escape messageid in URLs

Failing to do this caused invalid URLs for about 100 messages in total,
generating http 400 errors, but it may also have caused some URLs to
generate 404's when they shouldn't have.
---
 django/archives/mailarchives/templates/datelist.html |  2 +-
 django/archives/mailarchives/templates/message.html  | 12 ++++++------
 .../mailarchives/templates/message_flat.html         |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/django/archives/mailarchives/templates/datelist.html b/django/archives/mailarchives/templates/datelist.html
index 1602ca9..0799420 100644
--- a/django/archives/mailarchives/templates/datelist.html
+++ b/django/archives/mailarchives/templates/datelist.html
@@ -14,7 +14,7 @@
 <h3>{{m.date.date}}</h3>
 <ul>
 {%endifchanged%}
-  <li><a href="/message-id/{{m.messageid}}">{{m.subject|default:"[No subject]"}}</a> {{m.mailfrom|nameonly}} ({{m.date.time|time:"H:i"}})</li>
+  <li><a href="/message-id/{{m.messageid|urlencode}}">{{m.subject|default:"[No subject]"}}</a> {{m.mailfrom|nameonly}} ({{m.date.time|time:"H:i"}})</li>
 {%if forloop.last%}
 </ul>
 <p></p>
diff --git a/django/archives/mailarchives/templates/message.html b/django/archives/mailarchives/templates/message.html
index 1d09e24..c733a1f 100644
--- a/django/archives/mailarchives/templates/message.html
+++ b/django/archives/mailarchives/templates/message.html
@@ -45,13 +45,13 @@ $(function(){
  </tr>
  <tr>
   <th>Message-ID:</th>
-  <td><a href="/message-id/{{msg.messageid}}">{{msg.messageid}}</a> (view <a href="/message-id/raw/{{msg.messageid}}">raw</a> or <a href="/message-id/flat/{{msg.messageid}}">whole thread</a>)</td>
+  <td><a href="/message-id/{{msg.messageid|urlencode}}">{{msg.messageid}}</a> (view <a href="/message-id/raw/{{msg.messageid|urlencode}}">raw</a> or <a href="/message-id/flat/{{msg.messageid|urlencode}}">whole thread</a>)</td>
  </tr>
  <tr>
   <th>Thread:</th>
   <td>
    <select id="thread_select" onchange="onThreadSelect()">
-{%for m in threadstruct%}{%if m.id%}<option value="{{m.messageid}}"{%if m.id = msg.id%} selected="selected"{%endif%}{%if m.hasattachment%} class="hasatt"{%endif%}>{{m.indent|safe}}{{m.printdate}} from {{m.mailfrom|hidemail}}</option>{%endif%}
+{%for m in threadstruct%}{%if m.id%}<option value="{{m.messageid|urlencode}}"{%if m.id = msg.id%} selected="selected"{%endif%}{%if m.hasattachment%} class="hasatt"{%endif%}>{{m.indent|safe}}{{m.printdate}} from {{m.mailfrom|hidemail}}</option>{%endif%}
 {%endfor%}
    </select>
   </td>
@@ -83,14 +83,14 @@ Description: {{a.contenttype}} ({{a.len|filesizeformat}}) {%if a.inlineable%}(in
 {%if parent%}
 <h3>In response to</h3>
 <ul>
-<li><a href="/message-id/{{parent.messageid}}">{{parent.subject}}</a> at {{parent.printdate}} from {{parent.mailfrom|nameonly}}</li>
+<li><a href="/message-id/{{parent.messageid|urlencode}}">{{parent.subject}}</a> at {{parent.printdate}} from {{parent.mailfrom|nameonly}}</li>
 </ul>
 {%endif%}
 {%if responses %}
 <h3>Responses</h3>
 <ul>
 {%for m in responses%}
-<li><a href="/message-id/{{m.messageid}}">{{m.subject}}</a> at {{m.printdate}} from {{m.mailfrom|nameonly}}</li>
+<li><a href="/message-id/{{m.messageid|urlencode}}">{{m.subject}}</a> at {{m.printdate}} from {{m.mailfrom|nameonly}}</li>
 {%endfor%}
 </ul>
 {%endif%}
@@ -100,11 +100,11 @@ Description: {{a.contenttype}} ({{a.len|filesizeformat}}) {%if a.inlineable%}(in
 <blockquote>
  <table border="0">
   {%if info.next%}
-   <tr><td><a href="/message-id/{{info.next.msgid}}">Next</a>:</td><td><b>From:</b> {{info.next.from|nameonly}}</td><td><b>Date:</b> {{info.next.date}}</td></tr>
+   <tr><td><a href="/message-id/{{info.next.msgid|urlencode}}">Next</a>:</td><td><b>From:</b> {{info.next.from|nameonly}}</td><td><b>Date:</b> {{info.next.date}}</td></tr>
    <tr><td></td><td colspan="2"><b>Subject</b>: {{info.next.subject}}</td></tr>
   {%endif%}
   {%if info.prev%}
-   <tr><td><a href="/message-id/{{info.prev.msgid}}">Previous</a>:</td><td><b>From</b>: {{info.prev.from|nameonly}}</td><td><b>Date</b>: {{info.prev.date}}</td></tr>
+   <tr><td><a href="/message-id/{{info.prev.msgid|urlencode}}">Previous</a>:</td><td><b>From</b>: {{info.prev.from|nameonly}}</td><td><b>Date</b>: {{info.prev.date}}</td></tr>
    <tr><td></td><td colspan="2"><b>Subject</b>: {{info.prev.subject}}</td></tr>
   {%endif%}
  </table>
diff --git a/django/archives/mailarchives/templates/message_flat.html b/django/archives/mailarchives/templates/message_flat.html
index d4bb4b7..ca3935a 100644
--- a/django/archives/mailarchives/templates/message_flat.html
+++ b/django/archives/mailarchives/templates/message_flat.html
@@ -16,7 +16,7 @@ window.onload = load;
 <h2>{{msg.subject}}</h2>
 {%for m in allmsg %}
 <div class="msgwrap">
-<a name="{{m.messageid}}"></a>
+<a name="{{m.messageid|urlencode}}"></a>
 <table class="message">
  <tr>
   <th>From:</th>
@@ -42,7 +42,7 @@ window.onload = load;
  </tr>
  <tr>
   <th>Message-ID:</th>
-  <td><a href="/message-id/{{m.messageid}}">{{m.messageid}}</a> (view <a href="/message-id/raw/{{m.messageid}}">raw</a>)</td>
+  <td><a href="/message-id/{{m.messageid|urlencode}}">{{m.messageid}}</a> (view <a href="/message-id/raw/{{m.messageid|urlencode}}">raw</a>)</td>
  </tr>
 </table>
 <div class="bodywrapper">
-- 
2.39.5