swh.web 0.16.3__py3-none-any.whl → 0.16.4__py3-none-any.whl

swh/web/utils/swh_templatetags.py

@@ -3,13 +3,12 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-import json
 import re
 from typing import Optional
 
 from django import template
 from django.contrib.staticfiles.finders import find
-from django.utils.safestring import mark_safe
+from django.utils.html import json_script
 
 from swh.web.save_code_now.origin_save import get_savable_visit_types
 from swh.web.utils import rst_to_html
@@ -72,19 +71,15 @@ def urlize_header_links(text):
     return ret[:-1]
 
 
-@register.filter
-def jsonify(obj):
-    """Utility function for converting a django template variable
-    to JSON in order to use it in script tags.
-
-    Args
-        obj: Any django template context variable
-
-    Returns:
-        JSON representation of the variable.
+@register.filter(safe=True)
+def swh_json_script(value, element_id):
+    """Safely outputs a Python object as JSON, wrapped in a <script> tag,
+    ready for use with JavaScript.
 
+    Same as ``json_script`` template filter from django but using a custom
+    JSON encoder.
     """
-    return mark_safe(json.dumps(obj, cls=SWHDjangoJSONEncoder))
+    return json_script(value, element_id, encoder=SWHDjangoJSONEncoder)
 
 
 @register.filter

swh/web/vault/assets/vault-ui.js

@@ -181,15 +181,17 @@ async function checkVaultCookingTasks() {
   });
   try {
     const responses = await Promise.all(cookingTaskRequests);
-    handleFetchErrors(responses);
+    handleFetchErrors(responses, [404]);
     const cookingTasks = await Promise.all(responses.map(r => r.json()));
 
     const table = $('#vault-cooking-tasks tbody');
     for (let i = 0; i < cookingTasks.length; ++i) {
       const cookingTask = tasks[cookingTasks[i].swhid];
-      cookingTask.status = cookingTasks[i].status;
-      cookingTask.fetch_url = cookingTasks[i].fetch_url;
-      cookingTask.progress_message = cookingTasks[i].progress_message;
+      if (cookingTask) {
+        cookingTask.status = cookingTasks[i].status;
+        cookingTask.fetch_url = cookingTasks[i].fetch_url;
+        cookingTask.progress_message = cookingTasks[i].progress_message;
+      }
     }
     for (let i = 0; i < vaultCookingTasks.length; ++i) {
       const cookingTask = vaultCookingTasks[i];

swh/web/webapp/assets/webapp/webapp-utils.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2024  The Software Heritage developers
+ * Copyright (C) 2018-2025  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
@@ -399,3 +399,20 @@ export function mirrorConfig() {
 export function resizeIframe() {
   return iframeResize.apply(null, arguments)[0].iframeResizer;
 }
+
+export function parseJsonScript(scriptElementId) {
+  return JSON.parse($(`#${scriptElementId}`).text());
+}
+
+export function toggleButtonText(button, text) {
+  const currentLabel = button.innerHTML;
+
+  if (currentLabel === text) {
+    return;
+  }
+
+  button.innerHTML = text;
+  setTimeout(function() {
+    button.innerHTML = currentLabel;
+  }, 1000);
+};

swh/web/webapp/assets/webapp/webapp.css

@@ -18,6 +18,14 @@ body {
     overflow-y: clip;
 }
 
+/* Prevent scrolling of background when modal is opened */
+body.modal-open {
+    overflow: hidden;
+    position: fixed;
+    width: 100%;
+}
+
+
 /* The Alegreya font used in swh-web ships some ligatures producing
 confusing text rendering, for instance the ligatures for `~` and some
 characters like e, y, u, ... so disable font common ligatures */

swh/web/webapp/templates/layout.html

@@ -56,9 +56,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses />.
 @licend  The above is the entire license notice for the JavaScript code in this page.
 */
     </script>
-    <script>SWH_CONFIG = {{swh_client_config|jsonify}};</script>
     <script src="{% url 'js-reverse' %}" type="text/javascript"></script>
-    <script>swh.webapp.setSwhObjectIcons({{ swh_object_icons|jsonify }});</script>
+    {{ swh_object_icons|swh_json_script:"swh_object_icons" }}
+    <script>swh.webapp.setSwhObjectIcons(swh.webapp.parseJsonScript('swh_object_icons'));</script>
     {{ request.user.is_authenticated|json_script:"swh_user_logged_in" }}
     {{ request.user.is_staff|json_script:"swh_user_is_staff" }}
     {{ user_is_ambassador|json_script:"swh_user_is_ambassador" }}
@@ -187,13 +187,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses />.
       </main>
       {% include "./includes/footer.html" %}
     </div>
-    <script>
-      swh.webapp.setContainerFullWidth();
-      {% if "server_url" in status and "json_path" in status %}
-        var statusServerURL = {{ status.server_url|jsonify }};
-        var statusJsonPath = {{ status.json_path|jsonify }};
-        swh.webapp.initStatusWidget(statusServerURL + statusJsonPath);
-      {% endif %}
-    </script>
+    {% if "server_url" in status and "json_path" in status %}
+      {{ status.server_url|swh_json_script:"status_server_url" }}
+      {{ status.json_path|swh_json_script:"status_json_path" }}
+      <script>
+        swh.webapp.setContainerFullWidth();
+        swh.webapp.initStatusWidget(
+          swh.webapp.parseJsonScript('status_server_url') +
+          swh.webapp.parseJsonScript('status_json_path')
+        );
+      </script>
+    {% endif %}
   </body>
 </html>

swh/web/webapp/tests/test_views.py

@@ -1,9 +1,12 @@
-# Copyright (C) 2022  The Software Heritage developers
+# Copyright (C) 2022-2025  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
+from datetime import datetime
+from pathlib import Path
 
 from django.templatetags.static import static
+from django.utils import timezone
 
 from swh.web.tests.helpers import check_html_get_response, check_http_get_response
 from swh.web.utils import reverse
@@ -29,3 +32,15 @@ def test_favicon_view(client):
     url = reverse("favicon")
     resp = check_http_get_response(client, url, status_code=301)
     assert resp["location"] == static(SWH_FAVICON)
+
+
+def test_securitytxt_static(settings):
+    security_txt = Path(settings.STATIC_DIR) / "security.txt"
+    # static/security.txt contains a static expiration date, this test will fail
+    # if it expires in less than 30 days so we can check the file content is still
+    # valid
+    expiration_date = datetime.fromisoformat(
+        security_txt.read_text().splitlines()[1].split(": ")[1]
+    )
+    delta = expiration_date - timezone.now()
+    assert delta.days > 30

{swh_web-0.16.3.dist-info → swh_web-0.16.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swh.web
-Version: 0.16.3
+Version: 0.16.4
 Summary: Software Heritage web UI
 Author-email: Software Heritage developers <swh-devel@inria.fr>
 Project-URL: Homepage, https://gitlab.softwareheritage.org/swh/devel/swh-web
@@ -37,7 +37,7 @@ Requires-Dist: looseversion
 Requires-Dist: msgpack
 Requires-Dist: prometheus-client
 Requires-Dist: psycopg
-Requires-Dist: pybadges>=2.2.1
+Requires-Dist: pybadges2
 Requires-Dist: pygments
 Requires-Dist: pymemcache
 Requires-Dist: python-magic>=0.4.0
@@ -45,7 +45,6 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: rfc3987
 Requires-Dist: sentry-sdk
-Requires-Dist: standard-imghdr; python_version > "3.12"
 Requires-Dist: swh.auth[django]>=0.6.7
 Requires-Dist: swh.core>=4.0.0
 Requires-Dist: swh.counters>=0.5.1