Changeset 249061 in webkit

Timestamp:

Aug 23, 2019, 12:25:31 PM (7 years ago)

Author:

Jonathan Bedard

Message:

results.webkit.org: Escape html in changelog
​https://bugs.webkit.org/show_bug.cgi?id=201025
<rdar://problem/54564837>

Reviewed by Darin Adler.

• resultsdbpy/resultsdbpy/view/commit_view.py:

(CommitView.commit): Output a dictionary instead of a JSON encoded string.

• resultsdbpy/resultsdbpy/view/templates/commit.html: Unpack commits dictionary

directly into a JavaScript dictionary.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• resultsdbpy/resultsdbpy/view/commit_view.py (modified) (1 diff)
• resultsdbpy/resultsdbpy/view/templates/commit.html (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-23  Jonathan Bedard  <jbedard@apple.com>
+
+        results.webkit.org: Escape html in changelog
+        https://bugs.webkit.org/show_bug.cgi?id=201025
+        <rdar://problem/54564837>
+
+        Reviewed by Darin Adler.
+
+        * resultsdbpy/resultsdbpy/view/commit_view.py:
+        (CommitView.commit): Output a dictionary instead of a JSON encoded string.
+        * resultsdbpy/resultsdbpy/view/templates/commit.html: Unpack commits dictionary
+        directly into a JavaScript dictionary.
+
 2019-08-20  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Tools/resultsdbpy/resultsdbpy/view/commit_view.py

@@ -60 +60 @@
             commit=commit,
             repository_ids=repositories,
-            commits=Commit.Encoder().encode([commit] + [item for lst in siblings.values() for item in lst]),
+            commits=Commit.Encoder().default([commit] + [item for lst in siblings.values() for item in lst]),
             **kwargs)
 

trunk/Tools/resultsdbpy/resultsdbpy/view/templates/commit.html

@@ -48 +48 @@
 <script type="module">
 import {CommitTable} from '/assets/js/commit.js';
-document.getElementById("commitTable").innerHTML = CommitTable({{ commits|safe }}, {{ repository_ids|safe }});
+
+function unescapeJinjaText(text) {
+    return text.replace(/&([^;]+);/g, function(match, encoded) {
+        switch (encoded) {
+        case 'amp':
+            return '&';
+        case 'gt':
+            return '>';
+        case 'lt':
+            return '<';
+        case 'quot':
+            return '"';
+        default:
+            if (encoded[0] != '#')
+                return encoded;
+            return String.fromCharCode(encoded.substr(1));
+        }
+    });
+}
+
+let commits = [
+{% for commit in commits %}    {
+    {% for key, value in commit.items() %}
+        {{ key }}:
+        {% if 'str' in value.__class__.__name__ %}
+            unescapeJinjaText('{{ value | replace("\\", "\\\\") | replace("\n", "\\n") }}')
+        {% else %}
+            {{ value }}
+        {% endif %},
+    {% endfor %}},
+{% endfor %}];
+
+document.getElementById('commitTable').innerHTML = CommitTable(commits, {{ repository|safe }});
 </script>
 {% endblock %}