Merge remote-tracking branch 'origin/develop' into develop

Author: weblate

devops/demo/landing-page/nginx.conf

@@ -23,6 +23,7 @@ http {
         location / {
             root /opt/nginx/webroot;
             index index.html;
+            add_header Content-Security-Policy "default-src 'none'; script-src 'self'; style-src 'self'; font-src 'self'; img-src 'self' https://securedrop.org;" always;
         }
     }
 }

devops/demo/landing-page/webroot/assets/js/demo.js

@@ -0,0 +1,40 @@
+// Add "copy to clipboard" functionality to all copy buttons
+document.querySelectorAll(".copy-btn").forEach(btn => {
+    btn.addEventListener("click", () => {
+        const selector = btn.dataset.target;
+        const text = document.querySelector(selector).textContent.trim();
+        navigator.clipboard.writeText(text);
+
+        // Display exactly one ephemeral success message
+        const cell = btn.parentNode;
+        const existing = cell.querySelector(".copiedtip");
+        if (existing) {
+            existing.remove();
+        }
+        const tip = document.createElement("span");
+        tip.className = "copiedtip";
+        tip.textContent = "Copied to clipboard!";
+        cell.appendChild(tip);
+        setTimeout(() => tip.remove(), 2500);
+    });
+});
+
+// Cycle through TOTP codes
+function updateOTP() {
+    const secret = document.getElementById("totpsecretvalue").textContent.trim();
+    const totp = new jsOTP.totp();
+    document.getElementById("totpvalue").textContent = totp.getOtp(secret);
+
+    const epoch = Math.round(new Date().getTime() / 1000.0);
+    const remaining = 30 - (epoch % 30);
+    const seconds = `${remaining}`.padStart(2, "0");
+    document.getElementById("totpttl").textContent = `(:${seconds} remaining)`;
+
+    if (remaining < 10) {
+        document.getElementById("totp").classList.add("expiring");
+    } else {
+        document.getElementById("totp").classList.remove("expiring");
+    }
+}
+updateOTP();
+setInterval(updateOTP, 1000);

devops/demo/landing-page/webroot/index.html

@@ -63,47 +63,6 @@ <h1>Demo Server</h1>
             </tbody>
         </table>
         <script src="/assets/js/jsOTP.js"></script>
-        <script>
-            // Add "copy to clipboard" functionality to all copy buttons
-            document.querySelectorAll(".copy-btn").forEach(btn => {
-                btn.addEventListener("click", () => {
-                    const selector = btn.dataset.target;
-                    const text = document.querySelector(selector).textContent.trim();
-                    navigator.clipboard.writeText(text);
-
-                    // Display exactly one ephemeral success message
-                    const cell = btn.parentNode;
-                    const existing = cell.querySelector(".copiedtip");
-                    if (existing) {
-                        existing.remove();
-                    }
-                    const tip = document.createElement("span");
-                    tip.className = "copiedtip";
-                    tip.textContent = "Copied to clipboard!";
-                    cell.appendChild(tip);
-                    setTimeout(() => tip.remove(), 2500);
-                });
-            });
-
-            // Cycle through TOTP codes
-            function updateOTP() {
-                const secret = document.getElementById("totpsecretvalue").textContent.trim();
-                const totp = new jsOTP.totp();
-                document.getElementById("totpvalue").textContent = totp.getOtp(secret);
-
-                const epoch = Math.round(new Date().getTime() / 1000.0);
-                const remaining = 30 - (epoch % 30);
-                const seconds = `${remaining}`.padStart(2, "0");
-                document.getElementById("totpttl").textContent = `(:${seconds} remaining)`;
-
-                if (remaining < 10) {
-                    document.getElementById("totp").classList.add("expiring");
-                } else {
-                    document.getElementById("totp").classList.remove("expiring");
-                }
-            }
-            updateOTP();
-            setInterval(updateOTP, 1000);
-        </script>
+        <script src="/assets/js/demo.js"></script>
     </body>
 </html>