-
+
{% block page_heading_extra %} diff --git a/templates/navbar.html b/templates/navbar.html index 26f85f02..a57e031e 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -33,7 +33,7 @@ {% bs_icon 'people-fill' %} {% trans "Groups" %} {% bs_icon 'card-list' %} {% trans "Logs" %} {% bs_icon 'trash' %} {% trans "Removed VMs" %} - {% bs_icon 'gear-wide-connected' %} {% trans "Settings" %} + {% bs_icon 'gear-wide-connected' %} {% trans "Settings" %}
{% endif %} diff --git a/virtsecrets/templates/create_secret_block.html b/virtsecrets/templates/create_secret_block.html index 4d7f301d..33a4ccff 100644 --- a/virtsecrets/templates/create_secret_block.html +++ b/virtsecrets/templates/create_secret_block.html @@ -11,10 +11,10 @@
{% trans "Create New Secret" %}
- +
-
- {% csrf_token %} + {% csrf_token %} +
diff --git a/virtsecrets/templates/secrets.html b/virtsecrets/templates/secrets.html index 1a57b7eb..21fb45d1 100644 --- a/virtsecrets/templates/secrets.html +++ b/virtsecrets/templates/secrets.html @@ -90,8 +90,8 @@
{% trans "Set secret value" %}
-
- {% csrf_token %} + {% csrf_token %} +
diff --git a/webvirtcloud/tests/test_unique_ids.py b/webvirtcloud/tests/test_unique_ids.py new file mode 100644 index 00000000..1dc583ae --- /dev/null +++ b/webvirtcloud/tests/test_unique_ids.py @@ -0,0 +1,55 @@ +"""Every HTML page a superuser can open has unique element IDs: a repeated +ID makes getElementById, labels and Bootstrap targets reach the first one +only. Pages are rendered on libvirt's test driver.""" + +from collections import Counter +from unittest.mock import patch + +import libvirt +from computes.models import Compute +from django.contrib.auth import get_user_model +from django.test import TestCase +from django.urls import NoReverseMatch, URLPattern, URLResolver, get_resolver, reverse +from instances.models import Flavor, Instance +from lxml import html + + +def named_urls(patterns, prefix="", keys=()): + for p in patterns: + if isinstance(p, URLResolver): + yield from named_urls(p.url_patterns, f"{prefix}{p.namespace}:" if p.namespace else prefix, + keys + tuple(p.pattern.regex.groupindex)) + elif isinstance(p, URLPattern) and p.name: + yield prefix + p.name, keys + tuple(p.pattern.regex.groupindex) + + +class UniqueIdTests(TestCase): + def test_no_page_repeats_an_id(self): + conn = libvirt.open("test:///default") + self.addCleanup(conn.close) + compute = Compute.objects.create(name="testdrv", hostname="localhost", login="", password="", type=4) + vm = Instance.objects.create(compute=compute, name="test", uuid=conn.lookupByName("test").UUIDString()) + Flavor.objects.create(label="second", memory=512, vcpu=1, disk=10) # the flavor modals repeat per flavor + self.client.force_login(get_user_model().objects.create_superuser("ids", "ids@example.com", "pw")) + self.client.raise_request_exception = False + values = {"pk": vm.id, "compute_id": compute.id, "pool": "default-pool", "arch": "i686", "machine": "pc"} + checked = [] + with patch("vrtManager.connection.connection_manager.get_connection", return_value=conn), \ + patch("vrtManager.connection.wvmConnect.get_machine_types", return_value=["pc"]), \ + patch("vrtManager.connection.wvmConnect.get_nwfilters", return_value=[]), \ + patch.object(libvirt.virConnect, "getMemoryStats", return_value={"total": 8 << 20, "free": 4 << 20, "buffers": 0, "cached": 0}), \ + patch.object(libvirt.virConnect, "getCPUStats", return_value={"kernel": 1, "idle": 1, "user": 1, "iowait": 0}): + for name, keys in named_urls(get_resolver().url_patterns): + try: + url = reverse(name, kwargs={k: values.get(k, 1) for k in keys}) + except NoReverseMatch: + continue + response = self.client.get(url) + if response.status_code != 200 or not response["Content-Type"].startswith("text/html"): + continue + checked.append(name) + ids = Counter(html.fromstring(response.content).xpath("//@id")) + with self.subTest(page=name): + self.assertEqual({i: n for i, n in ids.items() if n > 1}, {}) + self.assertTrue({"index", "overview", "instances:instance", "nwfilter"} <= set(checked), checked) + self.assertIn("instances:create_instance", checked)