DNS: cache-bust dns.js (DNS_STATIC_VERSION), no-cache headers on CloudFlare page

CyberCP/settings.py

@@ -141,6 +141,7 @@ TEMPLATES = [
                 'baseTemplate.context_processors.cosmetic_context',
                 'baseTemplate.context_processors.notification_preferences_context',
                 'baseTemplate.context_processors.firewall_static_context',
+                'baseTemplate.context_processors.dns_static_context',
             ],
         },
     },

baseTemplate/context_processors.py

@@ -78,3 +78,28 @@ def firewall_static_context(request):
     return {
         'FIREWALL_STATIC_VERSION': version
     }
+
+
+def dns_static_context(request):
+    """Cache-busting for DNS static assets (bumps when dns.js changes). Avoids stale JS/layout."""
+    try:
+        from django.conf import settings
+        base = settings.BASE_DIR
+        paths = [
+            os.path.join(base, 'dns', 'static', 'dns', 'dns.js'),
+            os.path.join(base, 'static', 'dns', 'dns.js'),
+            os.path.join(base, 'public', 'static', 'dns', 'dns.js'),
+        ]
+        version = 0
+        for p in paths:
+            try:
+                version = max(version, int(os.path.getmtime(p)))
+            except (OSError, TypeError):
+                pass
+        if version <= 0:
+            version = int(time.time())
+    except (OSError, AttributeError):
+        version = int(time.time())
+    return {
+        'DNS_STATIC_VERSION': version
+    }

baseTemplate/templates/baseTemplate/index.html

@@ -2220,7 +2220,7 @@
     <script src="{% static 'websiteFunctions/websiteFunctions.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>
     <script src="{% static 'userManagment/userManagment.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>
     <script src="{% static 'databases/databases.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>
-    <script src="{% static 'dns/dns.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>
+    <script src="{% static 'dns/dns.js' %}?v={{ CP_VERSION }}&dns={{ DNS_STATIC_VERSION }}" data-cfasync="false"></script>
     <script src="{% static 'mailServer/mailServer.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>
     <script src="{% static 'ftp/ftp.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>
     <script src="{% static 'backup/backup.js' %}?v={{ CP_VERSION }}" data-cfasync="false"></script>

dns/views.py

@@ -199,7 +199,12 @@ def addDeleteDNSRecordsCloudFlare(request):
     try:
         userID = request.session['userID']
         dm = DNSManager()
-        return dm.addDeleteDNSRecordsCloudFlare(request, userID)
+        response = dm.addDeleteDNSRecordsCloudFlare(request, userID)
+        if hasattr(response, 'headers'):
+            response['Cache-Control'] = 'no-cache, no-store, must-revalidate, max-age=0'
+            response['Pragma'] = 'no-cache'
+            response['Expires'] = '0'
+        return response
     except KeyError:
         return redirect(loadLoginPage)