From 081d954140cb8bc064464a8b1418e5640779bac3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 04 2019 08:45:52 +0000
Subject: Some more javascript fixes to support CSP headers


All the inline javascript that is legit for the browser to run must be
using a nonce, without that things will no work.
This commit fixes a few missing ones and a bit of indentation/style.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/blame.html b/pagure/templates/blame.html
index db1af7c..9784a3d 100644
--- a/pagure/templates/blame.html
+++ b/pagure/templates/blame.html
@@ -180,7 +180,9 @@ No content found in this repository
 <script type="text/javascript"
   src="{{ url_for('static', filename='vendor/highlight.js/spec.js') }}?version={{ g.version}}"></script>
 
-<script>hljs.initHighlightingOnLoad();</script>
+<script type="text/javascript" nonce="{{ g.nonce }}">
+  hljs.initHighlightingOnLoad();
+</script>
 
 <script type="text/javascript" nonce="{{ g.nonce }}">
 function updateHighlight() {
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
index 9772029..486049a 100644
--- a/pagure/templates/edit_file.html
+++ b/pagure/templates/edit_file.html
@@ -112,9 +112,11 @@
 
 {% block jscripts %}
 {{ super() }}
-<script>var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("textareaCode"), {
+<script type="text/javascript" nonce="{{ g.nonce }}">
+    var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("textareaCode"), {
     lineNumbers: true
-  });</script>
+  });
+</script>
 <script type="text/javascript" nonce="{{ g.nonce }}">
 
 var lbranch = $('#branch').html();
diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 2d83b90..e094e1c 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -302,6 +302,6 @@ No content found in this repository
     window.location.hash = hash;
     return false;
   });
-  </script>
+</script>
 
 {% endblock %}
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 325b6ab..97dd00f 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -637,7 +637,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
 
 {% block jscripts %}
 {{ super() }}
-<script type="text/javascript">
+<script type="text/javascript" nonce="{{ g.nonce }}">
   var UPLOAD_URL = "{{ url_for('ui_ns.upload_issue', repo=repo.name, username=username, namespace=repo.namespace, issueid=issue.id) }}";
 </script>
 <script type="text/javascript"
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index d8560fb..dfcccfb 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -290,15 +290,16 @@
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript"
-        src="{{ url_for('static',
-            filename='vendor/lazyload/lazyload.min.js') }}?version={{ g.version}}">
-    </script>
+    src="{{ url_for('static',
+        filename='vendor/lazyload/lazyload.min.js') }}?version={{ g.version}}">
+</script>
+
 <script type="text/javascript" nonce="{{ g.nonce }}">
 window.addEventListener("load", function(event) {
     lazyload();
 });
-
 </script>
+
 <script type="text/javascript" nonce="{{ g.nonce }}">
 $("#giturl-toggle").on('click', function(event){
   event.stopPropagation();