From 9ee7341a50928075919649474997f674cf715839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Fri, 20 Jan 2023 12:47:45 +0100
Subject: [PATCH] fix: Force d3js version, update must be done manually.

---
 tools/3rdparty.py                | 7 +++----
 website/web/sri.txt              | 2 +-
 website/web/templates/stats.html | 4 ++--
 website/web/templates/tree.html  | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/tools/3rdparty.py b/tools/3rdparty.py
index deddc5f0..7961a26e 100755
--- a/tools/3rdparty.py
+++ b/tools/3rdparty.py
@@ -4,16 +4,15 @@ import requests
 
 from lookyloo.default import get_homedir
 
-d3js_version = '7'
+d3js_version = '7.8.2'
 jquery_version = "3.6.3"
 datatables_version = "1.13.1"
 
-
 if __name__ == '__main__':
     dest_dir = get_homedir() / 'website' / 'web' / 'static'
 
-    d3 = requests.get(f'https://d3js.org/d3.v{d3js_version}.min.js')
-    with (dest_dir / f'd3.v{d3js_version}.min.js').open('wb') as f:
+    d3 = requests.get(f'https://cdn.jsdelivr.net/npm/d3@{d3js_version}/dist/d3.min.js')
+    with (dest_dir / 'd3.min.js').open('wb') as f:
         f.write(d3.content)
         print(f'Downloaded d3js v{d3js_version}.')
 
diff --git a/website/web/sri.txt b/website/web/sri.txt
index 46a37c03..64c7038f 100644
--- a/website/web/sri.txt
+++ b/website/web/sri.txt
@@ -7,7 +7,7 @@
     "cookie_read.png": "mdXCeuNFPvshSwIXAJLoR1xFjXb+K2Mgu47Q1fnUAO8j1N2c/uJuE8sGuBHHbS8HOyr/CbOC6Uf3zsm9KvAs8Q==",
     "cookie_received.png": "EqL5fRFwjjXkSp242nacVFy7N8f1QAGJv4OIVDKQkDJQvq2MphwUnfLZUQvN3NMayHS/VTGQbgdQVjcOSQ2blA==",
     "css.png": "XDfV8fW5XRQlHT20rZn3d6LdIp2Dzk+mnZlicBv61iJGFMENLSM4SDgRcGb+x927AlI3lb6qv2C6tJAR2nDl5g==",
-    "d3.v7.min.js": "oKI0pS1ut+mxQZdqnD3w9fqArLyILRsT3Dx0B+8RVEXzEk3aNK3J3pWlaGJ8MtTs1oiwyXDAH6hG6jy1sY0YqA==",
+    "d3.min.js": "oKI0pS1ut+mxQZdqnD3w9fqArLyILRsT3Dx0B+8RVEXzEk3aNK3J3pWlaGJ8MtTs1oiwyXDAH6hG6jy1sY0YqA==",
     "datatables.min.css": "aAK5FfmKSgDObcfjDNNC3n3cbUgv+nST6ChbS8HRbaCEMNxaLNEXyGDUV3n5ApA/nzcT8UdrocYn3Dqfj56mKQ==",
     "datatables.min.js": "dIxEgfQKFmMQ9OqrCh0ExfFws3aok9xntOzPJ6cn19YKfN+l0WaTnSHhPVOkPJidDQ+UaBvU1a2rVQU8Io19fg==",
     "down.jpg": "LHRHJ5yCaSjNcDfEoChGIfh7K5HrMYbaGn7EOlxgZ8GoLIwb0nFBkpoOMG9gMHA/pBX2skkXMukvKJC6P6FBGg==",
diff --git a/website/web/templates/stats.html b/website/web/templates/stats.html
index 380628bf..f2221357 100644
--- a/website/web/templates/stats.html
+++ b/website/web/templates/stats.html
@@ -74,8 +74,8 @@
 
 {% block scripts %}
 {{ super() }}
-<script src='{{ url_for('static', filename='d3.v7.min.js') }}'
-        integrity="{{get_sri('static', 'd3.v7.min.js')}}"
+<script src='{{ url_for('static', filename='d3.min.js') }}'
+        integrity="{{get_sri('static', 'd3.min.js')}}"
         crossorigin="anonymous"></script>
 <script src='{{ url_for('static', filename='stats_graph.js') }}'
         integrity="{{get_sri('static', 'stats_graph.js')}}"
diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html
index 4fc316c3..3bf932c0 100644
--- a/website/web/templates/tree.html
+++ b/website/web/templates/tree.html
@@ -27,8 +27,8 @@
 
 {% block scripts %}
   {{ super() }}
-  <script src='{{ url_for('static', filename='d3.v7.min.js') }}'
-          integrity="{{get_sri('static', 'd3.v7.min.js')}}"
+  <script src='{{ url_for('static', filename='d3.min.js') }}'
+          integrity="{{get_sri('static', 'd3.min.js')}}"
           crossorigin="anonymous"></script>
   <script src='{{ url_for('static', filename='tree.js') }}'
           integrity="{{get_sri('static', 'tree.js')}}"