From 591429b0c9531aafc7cd786f77d069255e1b0866 Mon Sep 17 00:00:00 2001 From: catborise Date: Sat, 26 Sep 2026 12:10:35 +0300 Subject: [PATCH 001/765] feat(console): add comprehensive test suite and expand send keys menu - Add 23 unit and integration tests covering console views, authorization, URL/path normalization, and novncd daemon token extraction - Refactor console/novncd arg parsing into __main__ block for clean test imports - Expand Send Key(s) menu into categorized sections (System, Navigation/Desktop, Terminal Control, Virtual Consoles) - Implement non-destructive LIFO sendKeyCombo using public rfb.sendKey API, eliminating vendor debt - Wire Send Key actions across Lite, Full, and PTY (xterm) console templates - Add modern navigator.keyboard.lock support during fullscreen sessions --- console/novncd | 21 +- console/templates/console-base.html | 53 ++-- console/templates/console-vnc-full.html | 110 ++++++++ console/templates/console-vnc-lite.html | 158 ++++++++--- console/templates/console-xterm.html | 32 ++- console/tests.py | 354 +++++++++++++++++++++++- console/views.py | 31 ++- 7 files changed, 679 insertions(+), 80 deletions(-) diff --git a/console/novncd b/console/novncd index 402e3cdc..d16806fe 100755 --- a/console/novncd +++ b/console/novncd @@ -65,16 +65,6 @@ def get_parser(default_host=WS_HOST, default_port=WS_PORT or 6080, default_cert= return parser -options = get_parser().parse_args() - -FORMAT = "%(asctime)s - %(name)s - %(levelname)s : %(message)s" -if options.debug: - logging.basicConfig(level=logging.DEBUG, format=FORMAT) - options.verbose = True -elif options.verbose: - logging.basicConfig(level=logging.INFO, format=FORMAT) -else: - logging.basicConfig(level=logging.WARNING, format=FORMAT) try: from websockify import WebSocketProxy @@ -302,6 +292,17 @@ else: if __name__ == "__main__": + options = get_parser().parse_args() + + FORMAT = "%(asctime)s - %(name)s - %(levelname)s : %(message)s" + if options.debug: + logging.basicConfig(level=logging.DEBUG, format=FORMAT) + options.verbose = True + elif options.verbose: + logging.basicConfig(level=logging.INFO, format=FORMAT) + else: + logging.basicConfig(level=logging.WARNING, format=FORMAT) + if USE_HANDLER: # Create the WebSocketProxy with NovaProxyRequestHandler handler server = WebSocketProxy( diff --git a/console/templates/console-base.html b/console/templates/console-base.html index 11e38fd4..ecb8ed21 100644 --- a/console/templates/console-base.html +++ b/console/templates/console-base.html @@ -35,7 +35,7 @@
-
- - - -
- - -
-
- -
-
Connect
+
+
-
- -
-
-
-
    -
  • - - -
    • -
  • - - {% if perms.instances.passwordless_console %} - - {% else %} - - {% endif %} -
    • -
  • - -
    • -
-
+ +
+ + +
+
+ +
+ +
+
+
+ + +
+
+
+ {% trans 'Server identity' %} +
+
+ {% trans 'The server has provided the following identifying information:' %} +
+
+ {% trans 'Fingerprint:' %} + +
+
+ {% trans 'Please verify that the information is correct and press "Approve". Otherwise press "Reject".' %} +
+
+ + +
+
+
+ + +
+
+
+ {% trans 'Credentials' %} +
+
+ + +
+
+ + {% if perms.instances.passwordless_console %} + + {% else %} + + {% endif %} +
+
+ +
+
-
diff --git a/console/templates/console-vnc-lite.html b/console/templates/console-vnc-lite.html index 509e799a..d4d0c063 100755 --- a/console/templates/console-vnc-lite.html +++ b/console/templates/console-vnc-lite.html @@ -23,13 +23,6 @@ - - - - - - + + + + + + +
+
+
noVNC encountered an error:
+
+
+
+
+ + +
+ +
+
+ +
+ +

no
VNC

+ +
+ + + + + +
+ +
+ + + +
+
+ + + + + + +
+
+ + + +
+
+
+ Power +
+ + + +
+
+ + + +
+
+
+ Clipboard +
+

+ Edit clipboard content in the textarea below. +

+ +
+
+ + + + + + +
+
+
+ Settings +
+
    +
  • + +
    • +
  • + +
    • +
    • +
  • + +
    • +
  • + + +
    • +
    • +
  • +
    Advanced
    +
      +
    • + + +
      • +
    • + + +
      • +
      • +
    • + + +
      • +
    • +
      WebSocket
      +
        +
      • + +
        • +
      • + + +
        • +
      • + + +
        • +
      • + + +
        • +
      +
      • +
      • +
    • + +
      • +
    • + + +
      • +
      • +
    • + +
      • +
      • + +
    • + +
      • +
    +
    • +
    • +
  • + Version: + +
    • +
+
+
+ + + + +
+
+ +
+ +
+
+
+
+ + +
+ + +
+
+ +
+ +
+
+
+ + +
+
+
+ Server identity +
+
+ The server has provided the following identifying information: +
+
+ Fingerprint: + +
+
+ Please verify that the information is correct and press + "Approve". Otherwise press "Reject". +
+
+ + +
+
+
+ + +
+
+
+ Credentials +
+
+ + +
+
+ + +
+
+ +
+
+
+ + +
+
+
+ +
+ +
+ + +
+ + +
+ + + + diff --git a/static/js/novnc/vnc_lite.html b/static/js/novnc/vnc_lite.html new file mode 100644 index 00000000..79d48146 --- /dev/null +++ b/static/js/novnc/vnc_lite.html @@ -0,0 +1,180 @@ + + + + + + noVNC + + + + + + + +
+
Loading
+
Send CtrlAltDel
+
+
+ +
+ + From f19c30840eb42326c7db3c896f63442df7a31fb6 Mon Sep 17 00:00:00 2001 From: catborise Date: Sat, 26 Sep 2026 19:28:22 +0300 Subject: [PATCH 006/765] fix(console): prevent DOM-based XSS in console views and escape JS strings - Validate and coerce console query parameters (view_only, scale, resize_session, clip_viewport) to strict booleans via to_bool in console/views.py - Sanitize view parameter to strictly 'lite' or 'full' - Apply escapejs filter to all JS string interpolations in console-vnc-full.html, console-vnc-lite.html, console-spice-lite.html, and console-xterm.html - Replace unsafe '| safe' filter in console-spice-lite.html with escapejs - Add unit tests for XSS query param mitigation and escapejs character encoding --- console/templates/console-spice-lite.html | 11 +++-- console/templates/console-vnc-full.html | 14 +++---- console/templates/console-vnc-lite.html | 20 ++++----- console/templates/console-xterm.html | 6 +-- console/tests.py | 50 +++++++++++++++++++++++ console/views.py | 36 ++++++++++++---- 6 files changed, 102 insertions(+), 35 deletions(-) diff --git a/console/templates/console-spice-lite.html b/console/templates/console-spice-lite.html index 469c9715..d6ddf3df 100644 --- a/console/templates/console-spice-lite.html +++ b/console/templates/console-spice-lite.html @@ -65,7 +65,7 @@ // By default, use the host and port of server that served this file // host = spice_query_var('host', window.location.hostname); - host = '{{ ws_host| safe }}'; + host = '{{ ws_host|escapejs }}'; // Note that using the web server port only makes sense // if your web server has a reverse proxy to relay the WebSocket @@ -80,7 +80,7 @@ } } //port = spice_query_var('port', default_port); - port = '{{ ws_port| safe }}'; + port = '{{ ws_port|escapejs }}'; if (window.location.protocol == 'https:') { scheme = "wss://"; } @@ -93,17 +93,16 @@ } if (password === undefined) { - {% if perms.instances.passwordless_console %} - password = '{{ console_passwd }}'; + {% if perms.instances.passwordless_console and console_passwd %} + password = '{{ console_passwd|escapejs }}'; {% else %} password = prompt('{% trans "Password" %}'); {% endif %} - //password = '{{ console_passwd | safe }}'; } if (password === 'None') password = ''; //var path = spice_query_var('path', 'websockify'); - var path = spice_query_var('path', '{{ ws_path }}'); + var path = spice_query_var('path', '{{ ws_path|escapejs }}'); if ((!host) || (!port)) { console.log('{% trans "must specify host and port in URL" %}'); diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html index 714ab036..aedeb2b5 100755 --- a/console/templates/console-vnc-full.html +++ b/console/templates/console-vnc-full.html @@ -176,24 +176,24 @@ bindKeyAction('ctrlaltf' + (i + 1), () => sendCtrlAltFN(i)); } - let fullPath = '{{ ws_path }}'; - const token = '{{ token }}'; + let fullPath = '{{ ws_path|escapejs }}'; + const token = '{{ token|escapejs }}'; if (token) { fullPath += (fullPath.includes('?') ? '&' : '?') + 'token=' + encodeURIComponent(token); } const defaults = { autoconnect: true, - resize: '{{ scale }}' === 'true' ? 'scale' : 'off', - view_only: {{ view_only }}, - view_clip: {{ clip_viewport }}, + resize: {{ scale|yesno:"'scale','off'" }}, + view_only: {{ view_only|yesno:"true,false" }}, + view_clip: {{ clip_viewport|yesno:"true,false" }}, {% if perms.instances.passwordless_console and console_passwd %} - password: '{{ console_passwd }}', + password: '{{ console_passwd|escapejs }}', {% endif %} }; const mandatory = { - host: '{{ ws_host }}', + host: '{{ ws_host|escapejs }}', port: {{ ws_port }}, path: fullPath, }; diff --git a/console/templates/console-vnc-lite.html b/console/templates/console-vnc-lite.html index d4d0c063..0fbeb745 100755 --- a/console/templates/console-vnc-lite.html +++ b/console/templates/console-vnc-lite.html @@ -260,17 +260,17 @@ // Read parameters specified in the URL query string // By default, use the host and port of server that served this file - const host = readQueryVariable('host', '{{ ws_host }}'); - let port = readQueryVariable('port', '{{ ws_port }}'); + const host = readQueryVariable('host', '{{ ws_host|escapejs }}'); + let port = readQueryVariable('port', '{{ ws_port|escapejs }}'); - {% if perms.instances.passwordless_console %} - const password = '{{ console_passwd }}'; + {% if perms.instances.passwordless_console and console_passwd %} + const password = '{{ console_passwd|escapejs }}'; {% else %} const password = readQueryVariable('password'); {% endif %} //const path = readQueryVariable('path', 'websockify'); - const path = readQueryVariable('path', '{{ ws_path }}'); + const path = readQueryVariable('path', '{{ ws_path|escapejs }}'); // | | | | | | // | | | Connect | | | @@ -294,7 +294,7 @@ } else { url += '/'; } - const token = readQueryVariable('token', '{{ token }}'); + const token = readQueryVariable('token', '{{ token|escapejs }}'); if (token) { url += (url.includes('?') ? '&' : '?') + 'token=' + encodeURIComponent(token); } @@ -310,10 +310,10 @@ rfb.addEventListener("desktopname", updateDesktopName); // Set parameters that can be changed on an active connection - rfb.scaleViewport = {{ scale }}; - rfb.viewOnly = {{ view_only }}; - rfb.resizeSession = {{ resize_session }}; - rfb.clipViewport = {{ clip_viewport }}; + rfb.scaleViewport = {{ scale|yesno:"true,false" }}; + rfb.viewOnly = {{ view_only|yesno:"true,false" }}; + rfb.resizeSession = {{ resize_session|yesno:"true,false" }}; + rfb.clipViewport = {{ clip_viewport|yesno:"true,false" }}; {% endblock %} diff --git a/console/templates/console-xterm.html b/console/templates/console-xterm.html index 9fd1a853..3bae98f1 100644 --- a/console/templates/console-xterm.html +++ b/console/templates/console-xterm.html @@ -22,9 +22,9 @@ ")[0] + for s in content_full.split(" 'off' + url = reverse("console") + f"?token={self.token}&view=full" + resp = self.client.get(url) + self.assertEqual(resp.status_code, 200) + content = resp.content.decode("utf-8") + self.assertIn("resize: 'off',", content) + self.assertNotIn("'off'", content) + self.assertNotIn("'off'", content) + + # scale=True, resize_session=False -> 'scale' + url_scale = reverse("console") + f"?token={self.token}&view=full&scale=true" + resp_scale = self.client.get(url_scale) + self.assertEqual(resp_scale.status_code, 200) + content_scale = resp_scale.content.decode("utf-8") + self.assertIn("resize: 'scale',", content_scale) + + # resize_session=True -> 'remote' + url_remote = reverse("console") + f"?token={self.token}&view=full&resize_session=true" + resp_remote = self.client.get(url_remote) + self.assertEqual(resp_remote.status_code, 200) + content_remote = resp_remote.content.decode("utf-8") + self.assertIn("resize: 'remote',", content_remote) + @patch("console.views.wvmInstance") def test_console_libvirt_error_fallback(self, mock_wvm): From 4b55630b2d489411cf8cebbaaf13064a17a0ff30 Mon Sep 17 00:00:00 2001 From: catborise Date: Sat, 26 Sep 2026 21:45:54 +0300 Subject: [PATCH 008/765] style(console): fix flake8 E303 blank lines and line length in console tests --- console/tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/console/tests.py b/console/tests.py index 4077c38e..8106daa6 100644 --- a/console/tests.py +++ b/console/tests.py @@ -247,7 +247,8 @@ class ConsoleViewsTestCase(TestCase): # Attempt XSS injection via query parameters url = ( reverse("console") - + f"?token={self.token}&view=lite&view_only=alert('xss')&scale=true&clip_viewport=1" + + f"?token={self.token}" + + "&view=lite&view_only=alert('xss')&scale=true&clip_viewport=1" ) response = self.client.get(url) @@ -320,13 +321,14 @@ class ConsoleViewsTestCase(TestCase): self.assertIn("resize: 'scale',", content_scale) # resize_session=True -> 'remote' - url_remote = reverse("console") + f"?token={self.token}&view=full&resize_session=true" + url_remote = ( + reverse("console") + f"?token={self.token}&view=full&resize_session=true" + ) resp_remote = self.client.get(url_remote) self.assertEqual(resp_remote.status_code, 200) content_remote = resp_remote.content.decode("utf-8") self.assertIn("resize: 'remote',", content_remote) - @patch("console.views.wvmInstance") def test_console_libvirt_error_fallback(self, mock_wvm): mock_wvm.side_effect = libvirtError("Connection to libvirtd failed") From e980aca2ffc0977342727776333b6ff57575d851 Mon Sep 17 00:00:00 2001 From: catborise Date: Sat, 26 Sep 2026 22:34:13 +0300 Subject: [PATCH 009/765] feat(console): remove deprecated SPICE support in favor of noVNC - Remove obsolete spice-html5 static assets and SPICE console templates - Restrict default console types to VNC with migration 0012 - Filter out SPICE in VM creation form and backend capabilities - Return friendly deprecation notice if legacy VM is opened with SPICE - Clean up docs, architecture references, and libvirt-bootstrap scripts --- .gitignore | 1 + README.md | 6 +- .../0012_remove_spice_qemu_console_type.py | 38 + conf/test-vm.xml | 2 +- console/templates/console-spice-full.html | 231 - console/templates/console-spice-lite.html | 231 - console/tests.py | 19 +- console/views.py | 9 +- doc/architecture.md | 6 +- instances/templates/create_instance_w2.html | 6 + static/js/spice-html5/atKeynames.js | 189 - static/js/spice-html5/bitmap.js | 64 - static/js/spice-html5/cursor.js | 141 - static/js/spice-html5/display.js | 1272 - static/js/spice-html5/enums.js | 372 - static/js/spice-html5/filexfer.js | 94 - static/js/spice-html5/inputs.js | 335 - static/js/spice-html5/lz.js | 188 - static/js/spice-html5/main.js | 520 - static/js/spice-html5/playback.js | 409 - static/js/spice-html5/png.js | 262 - static/js/spice-html5/port.js | 94 - static/js/spice-html5/quic.js | 1345 - static/js/spice-html5/resize.js | 90 - static/js/spice-html5/simulatecursor.js | 208 - static/js/spice-html5/spice.css | 115 - static/js/spice-html5/spicearraybuffer.js | 58 - static/js/spice-html5/spiceconn.js | 526 - static/js/spice-html5/spicedataview.js | 124 - static/js/spice-html5/spicemsg.js | 1371 - static/js/spice-html5/spicetype.js | 497 - .../browser-es-module-loader/.npmignore | 0 .../browser-es-module-loader/README.md | 15 - .../dist/babel-worker.js | 55799 ---------------- .../dist/browser-es-module-loader.js | 1486 - .../dist/browser-es-module-loader.js.map | 1 - .../browser-es-module-loader/rollup.config.js | 16 - .../src/babel-worker.js | 25 - .../src/browser-es-module-loader.js | 280 - static/js/spice-html5/thirdparty/jsbn.js | 593 - static/js/spice-html5/thirdparty/prng4.js | 84 - static/js/spice-html5/thirdparty/rng.js | 107 - static/js/spice-html5/thirdparty/rsa.js | 153 - static/js/spice-html5/thirdparty/sha1.js | 351 - static/js/spice-html5/ticket.js | 260 - static/js/spice-html5/utils.js | 360 - static/js/spice-html5/webm.js | 673 - static/js/spice-html5/wire.js | 131 - 48 files changed, 62 insertions(+), 69095 deletions(-) create mode 100644 appsettings/migrations/0012_remove_spice_qemu_console_type.py delete mode 100644 console/templates/console-spice-full.html delete mode 100644 console/templates/console-spice-lite.html delete mode 100644 static/js/spice-html5/atKeynames.js delete mode 100644 static/js/spice-html5/bitmap.js delete mode 100644 static/js/spice-html5/cursor.js delete mode 100644 static/js/spice-html5/display.js delete mode 100644 static/js/spice-html5/enums.js delete mode 100644 static/js/spice-html5/filexfer.js delete mode 100644 static/js/spice-html5/inputs.js delete mode 100644 static/js/spice-html5/lz.js delete mode 100644 static/js/spice-html5/main.js delete mode 100644 static/js/spice-html5/playback.js delete mode 100644 static/js/spice-html5/png.js delete mode 100644 static/js/spice-html5/port.js delete mode 100644 static/js/spice-html5/quic.js delete mode 100644 static/js/spice-html5/resize.js delete mode 100644 static/js/spice-html5/simulatecursor.js delete mode 100755 static/js/spice-html5/spice.css delete mode 100644 static/js/spice-html5/spicearraybuffer.js delete mode 100644 static/js/spice-html5/spiceconn.js delete mode 100644 static/js/spice-html5/spicedataview.js delete mode 100644 static/js/spice-html5/spicemsg.js delete mode 100644 static/js/spice-html5/spicetype.js delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/.npmignore delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/README.md delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/dist/babel-worker.js delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/dist/browser-es-module-loader.js delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/dist/browser-es-module-loader.js.map delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/rollup.config.js delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/src/babel-worker.js delete mode 100644 static/js/spice-html5/thirdparty/browser-es-module-loader/src/browser-es-module-loader.js delete mode 100644 static/js/spice-html5/thirdparty/jsbn.js delete mode 100644 static/js/spice-html5/thirdparty/prng4.js delete mode 100644 static/js/spice-html5/thirdparty/rng.js delete mode 100644 static/js/spice-html5/thirdparty/rsa.js delete mode 100644 static/js/spice-html5/thirdparty/sha1.js delete mode 100644 static/js/spice-html5/ticket.js delete mode 100644 static/js/spice-html5/utils.js delete mode 100644 static/js/spice-html5/webm.js delete mode 100644 static/js/spice-html5/wire.js diff --git a/.gitignore b/.gitignore index bc289ab1..935ec575 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ htmlcov *.log templates/webvirtcloud.code-workspace DEPENDENCY_UPGRADE_PLAN.md +.agents diff --git a/README.md b/README.md index 22c81c92..99992ae8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ## Description -WebVirtCloud is a virtualization web interface for administrators and users. It allows delegating virtual machines to users with role-based permissions. A built-in noVNC / SPICE console presents a full graphical interface to the guest domain. KVM is currently the supported hypervisor. +WebVirtCloud is a virtualization web interface for administrators and users. It allows delegating virtual machines to users with role-based permissions. A built-in noVNC console presents a full graphical interface to the guest domain. KVM is currently the supported hypervisor. ## Features * QEMU/KVM Hypervisor Management @@ -14,7 +14,7 @@ WebVirtCloud is a virtualization web interface for administrators and users. It * Manage Multiple QEMU/KVM Hypervisors * Manage Hypervisor Datastore pools and storage volumes * Manage Hypervisor Networks and interfaces -* Instance Console Access with Web Browsers (noVNC & SPICE) +* Instance Console Access with Web Browsers (noVNC & xterm.js) * Libvirt API-based web management UI * User-based Authorization, Authentication, and 2FA (OTP) * User can add SSH public key to root in Instance @@ -322,7 +322,7 @@ sudo zypper install -y dmidecode && sudo systemctl restart libvirtd ``` > **Security Notice (Compute Node Firewall):** -> Libvirt compute nodes listen on VNC/SPICE ports (`5900`–`65535`) to allow WebVirtCloud to proxy graphical consoles. Ensure your firewall (`ufw`, `firewalld`, or `iptables`) restricts these ports to accept connections **only** from the WebVirtCloud panel IP, and never exposes them directly to public networks. +> Libvirt compute nodes listen on VNC ports (`5900`–`65535`) to allow WebVirtCloud to proxy graphical consoles. Ensure your firewall (`ufw`, `firewalld`, or `iptables`) restricts these ports to accept connections **only** from the WebVirtCloud panel IP, and never exposes them directly to public networks. --- diff --git a/appsettings/migrations/0012_remove_spice_qemu_console_type.py b/appsettings/migrations/0012_remove_spice_qemu_console_type.py new file mode 100644 index 00000000..2c9f356a --- /dev/null +++ b/appsettings/migrations/0012_remove_spice_qemu_console_type.py @@ -0,0 +1,38 @@ +from django.db import migrations + + +def update_console_type(apps, schema_editor): + AppSettings = apps.get_model("appsettings", "AppSettings") + db_alias = schema_editor.connection.alias + setting = ( + AppSettings.objects.using(db_alias) + .filter(key="QEMU_CONSOLE_DEFAULT_TYPE") + .first() + ) + if setting: + setting.value = "vnc" + setting.choices = "vnc" + setting.save(using=db_alias) + + +def reverse_console_type(apps, schema_editor): + AppSettings = apps.get_model("appsettings", "AppSettings") + db_alias = schema_editor.connection.alias + setting = ( + AppSettings.objects.using(db_alias) + .filter(key="QEMU_CONSOLE_DEFAULT_TYPE") + .first() + ) + if setting: + setting.choices = "vnc,spice" + setting.save(using=db_alias) + + +class Migration(migrations.Migration): + dependencies = [ + ("appsettings", "0011_alter_appsettings_id"), + ] + + operations = [ + migrations.RunPython(update_console_type, reverse_console_type), + ] diff --git a/conf/test-vm.xml b/conf/test-vm.xml index d14f25f9..9750668d 100644 --- a/conf/test-vm.xml +++ b/conf/test-vm.xml @@ -105,7 +105,7 @@ - +
diff --git a/virtsecrets/tests/__init__.py b/virtsecrets/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/virtsecrets/tests/test_create_secret.py b/virtsecrets/tests/test_create_secret.py new file mode 100644 index 00000000..7ed716db --- /dev/null +++ b/virtsecrets/tests/test_create_secret.py @@ -0,0 +1,28 @@ +"""A secret's usage value goes into its XML as text, whatever it holds: a +volume path, an iSCSI IQN or a Ceph name, and characters XML gives a meaning.""" + +from unittest.mock import patch + +from django.test import SimpleTestCase +from lxml import etree +from vrtManager.virtsecrets import wvmSecrets + + +class CreateSecretTests(SimpleTestCase): + def defined_xml(self, usage_type, data): + with patch("vrtManager.connection.connection_manager.get_connection") as get: + wvmSecrets("host", "login", "pw", 1).create_secret("no", "yes", usage_type, data) + return etree.fromstring(get.return_value.secretDefineXML.call_args.args[0]) + + def test_the_usage_value_is_text_of_its_element(self): + for usage_type, element, data in ( + ("volume", "volume", "/var/lib/libvirt/images/vm-1.qcow2"), + ("iscsi", "target", "iqn.2026-10.test.wvc:lun"), + ("ceph", "name", "client.libvirt secret"), + ("volume", "volume", "/a'b&d\""), + ): + with self.subTest(usage_type=usage_type, data=data): + secret = self.defined_xml(usage_type, data) + self.assertEqual((secret.get("ephemeral"), secret.get("private")), ("no", "yes")) + self.assertEqual(secret.find("usage").get("type"), usage_type) + self.assertEqual(secret.findtext(f"usage/{element}"), data) diff --git a/virtsecrets/tests/test_live_secrets.py b/virtsecrets/tests/test_live_secrets.py new file mode 100644 index 00000000..f55bc7f4 --- /dev/null +++ b/virtsecrets/tests/test_live_secrets.py @@ -0,0 +1,52 @@ +"""Live check that the secrets page creates a secret for each usage type +with a real usage value: a volume path, an iSCSI IQN and a Ceph name. Runs +only with TEST_LIBVIRT_HOST set.""" + +import os +import unittest + +import libvirt +from computes.models import Compute +from django.contrib.auth import get_user_model +from django.test import TestCase +from django.urls import reverse +from instances.tests import livetest +from vrtManager.connection import connection_manager + +P = livetest.PREFIX +USAGES = { + libvirt.VIR_SECRET_USAGE_TYPE_VOLUME: ("volume", f"/var/lib/libvirt/{P}secrets/vm-1.qcow2"), + libvirt.VIR_SECRET_USAGE_TYPE_ISCSI: ("iscsi", f"iqn.2026-10.test.wvc:{P}secret"), + libvirt.VIR_SECRET_USAGE_TYPE_CEPH: ("ceph", f"client.{P}secret secret"), +} + + +@unittest.skipUnless(livetest.enabled(), "Set TEST_LIBVIRT_HOST to run the live libvirt tests") +class LiveSecretsTestCase(TestCase): + def setUp(self): + args = dict( + hostname=os.environ["TEST_LIBVIRT_HOST"], + login=os.environ.get("TEST_LIBVIRT_LOGIN", ""), + password=os.environ.get("TEST_LIBVIRT_PASSWORD", ""), + type=int(os.environ.get("TEST_LIBVIRT_TYPE", 4)), + ) + self.conn = connection_manager.get_connection(*args.values()) + self.remove_secrets() + self.addCleanup(self.remove_secrets) + self.compute = Compute.objects.create(name="live-secrets", **args) + self.client.force_login(get_user_model().objects.create_superuser("live-secrets", "ls@example.com", "x")) + + def remove_secrets(self): + for secret in self.conn.listAllSecrets(): + if (secret.usageType(), secret.usageID()) in {(t, v) for t, (_, v) in USAGES.items()}: + secret.undefine() + + def test_each_usage_type_takes_a_real_value(self): + for usage_type, (name, value) in USAGES.items(): + with self.subTest(name): + response = self.client.post( + reverse("virtsecrets", args=[self.compute.id]), + {"create": "", "ephemeral": "no", "private": "no", "usage_type": name, "data": value}, + ) + self.assertEqual(response.status_code, 302) + self.assertEqual(self.conn.secretLookupByUsage(usage_type, value).usageID(), value) diff --git a/vrtManager/virtsecrets.py b/vrtManager/virtsecrets.py index c8772823..1117e7e5 100644 --- a/vrtManager/virtsecrets.py +++ b/vrtManager/virtsecrets.py @@ -1,21 +1,19 @@ import base64 +from lxml import etree from vrtManager.connection import wvmConnect +# the element of that holds the value, per usage type +USAGE_ELEMENTS = {"ceph": "name", "volume": "volume", "iscsi": "target"} + class wvmSecrets(wvmConnect): def create_secret(self, ephemeral, private, secret_type, data): - xml = f""" - """ - if secret_type == "ceph": - xml += f"""{data}""" - if secret_type == "volume": - xml += f"""{data}""" - if secret_type == "iscsi": - xml += f"""{data}""" - xml += """ - """ - self.wvm.secretDefineXML(xml) + # built with lxml: data is text, whatever characters it holds + secret = etree.Element("secret", ephemeral=ephemeral, private=private) + usage = etree.SubElement(secret, "usage", type=secret_type) + etree.SubElement(usage, USAGE_ELEMENTS[secret_type]).text = data + self.wvm.secretDefineXML(etree.tostring(secret, encoding="unicode")) def get_secret_value(self, uuid): secrt = self.get_secret(uuid) From ca74c02c4fcccadd0c72df9cd83f07d97e88e888 Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 19 Oct 2026 16:50:58 +0300 Subject: [PATCH 314/765] fix(templates): the fields of the create modals are named by their labels An accessibility scan with every modal opened found 49 fields without a name: the labels of the instance create forms (custom, template and each flavor's modal), the interface, network, secret and storage pool modals did not point at their fields. Each label now has a for= and its field an id, prefixed per form (and per flavor), so a click on the label focuses the field too. The "Advanced" collapse buttons and the memory and processing bars are named. The VCPU config select had id="vcpu_mode" in each of these forms, nine times on the create page; the unique-ID test did not see it as the test driver reports no CPU modes. The id goes (nothing used it), and the test now renders that branch. --- instances/templates/create_inst_block.html | 4 +- instances/templates/create_instance_w2.html | 192 +++++++++--------- interfaces/templates/create_iface_block.html | 42 ++-- networks/templates/create_net_block.html | 34 ++-- storages/templates/create_stg_block.html | 78 +++---- templates/pleasewaitdialog.html | 2 +- .../templates/create_secret_block.html | 16 +- webvirtcloud/tests/test_unique_ids.py | 1 + 8 files changed, 185 insertions(+), 184 deletions(-) diff --git a/instances/templates/create_inst_block.html b/instances/templates/create_inst_block.html index fcb51a83..555fc4a1 100644 --- a/instances/templates/create_inst_block.html +++ b/instances/templates/create_inst_block.html @@ -34,7 +34,7 @@ {{ compute.cpu_count }}
-
@@ -43,7 +43,7 @@ {{ compute.ram_size|filesizeformat }}
-
{{ compute.ram_usage }}%
diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html index 1c481742..b5f2ee09 100644 --- a/instances/templates/create_instance_w2.html +++ b/instances/templates/create_instance_w2.html @@ -104,9 +104,9 @@ {% csrf_token %}{% submission_key %}
- +
- @@ -116,9 +116,9 @@
{% if firmwares %}
- +
- {% for frm in firmwares %} {% endfor %} @@ -128,9 +128,9 @@ {% endif %} {% if dom_caps.cpu_modes %}
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} @@ -150,10 +150,10 @@
{% endif %}
- +
- {% if storages %} {% for storage in storages %} @@ -165,9 +165,9 @@
- +
- {% for network in networks %} {% endfor %} @@ -177,22 +177,22 @@
-
- +
- +
- +
- {% for nwfilter in nwfilters %} @@ -201,9 +201,9 @@
- +
- {% for model in net_models_host %} {% endfor %} @@ -211,9 +211,9 @@
- +
- {% for mode, name in cache_modes %} @@ -222,9 +222,9 @@
- +
- {% if not videos %} @@ -236,9 +236,9 @@
- +
- {% for addr, label in listener_addr %} {% endfor %} @@ -246,9 +246,9 @@
- +
- {% for bus in cdrom_buses %}
- +
- {% for bus in input_device_buses %}
- +
- +
{% if virtio_support %}
- +
- +
{% endif %} @@ -324,14 +324,14 @@
{% csrf_token %}{% submission_key %}
- +
- +
{% if firmwares %}
- +
+
{% if dom_caps.cpu_modes %}
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} @@ -371,9 +371,9 @@
{% endif %}
- +
- +
@@ -386,7 +386,7 @@
- +
+
- +
+ + + + @@ -506,7 +506,7 @@
- +
+
{% if virtio_support %}
- +
- +
{% endif %} @@ -555,16 +555,16 @@
{% csrf_token %}{% submission_key %}
- +
- +
{% if firmwares %}
- +
- {% for frm in firmwares %} {% endfor %} @@ -573,15 +573,15 @@
{% endif %}
- +
- +
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} @@ -600,16 +600,16 @@
- +
- +
- +
- {% if storages %} {% for storage in storages %} @@ -627,7 +627,7 @@
- +
+ +
- +
- {% for mode, name in cache_modes %} @@ -681,9 +681,9 @@
- +
- {% for nwfilter in nwfilters %} @@ -692,9 +692,9 @@
- +
- {% for model in net_models_host %} {% endfor %} @@ -702,9 +702,9 @@
- +
- {% if not videos %} @@ -716,9 +716,9 @@
- +
- {% for addr, label in listener_addr %} {% endfor %} @@ -726,9 +726,9 @@
- +
- {% for bus in cdrom_buses %}
- +
- {% for bus in input_device_buses %}
- +
- +
{% if virtio_support %}
- +
- +
{% endif %} diff --git a/interfaces/templates/create_iface_block.html b/interfaces/templates/create_iface_block.html index 3cac2efe..432b8c78 100644 --- a/interfaces/templates/create_iface_block.html +++ b/interfaces/templates/create_iface_block.html @@ -16,15 +16,15 @@ {% csrf_token %}
- +
- +
- +
- @@ -32,9 +32,9 @@
- +
- {% for dev in netdevs %} {% endfor %} @@ -42,7 +42,7 @@
- +
+
- +
- +
@@ -84,7 +84,7 @@
- +
+
- +
- +
@@ -110,7 +110,7 @@
- +
+
- +
- +
diff --git a/networks/templates/create_net_block.html b/networks/templates/create_net_block.html index 20634b2f..0b79c182 100644 --- a/networks/templates/create_net_block.html +++ b/networks/templates/create_net_block.html @@ -16,13 +16,13 @@ {% csrf_token %}
- +
- +
- +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/storages/templates/create_stg_block.html b/storages/templates/create_stg_block.html index c048b0a5..c5ed1a8a 100644 --- a/storages/templates/create_stg_block.html +++ b/storages/templates/create_stg_block.html @@ -47,22 +47,22 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
@@ -76,22 +76,22 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
@@ -105,40 +105,40 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- {% if secrets %} {% for secret in secrets %} @@ -170,32 +170,32 @@ {% csrf_token %}
- +
- +
- +
- +
- +
- +
- +
- +
- +
+
@@ -226,17 +226,17 @@ {% csrf_token %}
- +
- +
- +
- +
diff --git a/templates/pleasewaitdialog.html b/templates/pleasewaitdialog.html index 2d514713..02ce2c0c 100644 --- a/templates/pleasewaitdialog.html +++ b/templates/pleasewaitdialog.html @@ -8,7 +8,7 @@
-
+
diff --git a/virtsecrets/templates/create_secret_block.html b/virtsecrets/templates/create_secret_block.html index 34b7003d..8ff145bb 100644 --- a/virtsecrets/templates/create_secret_block.html +++ b/virtsecrets/templates/create_secret_block.html @@ -16,27 +16,27 @@ {% csrf_token %}
- +
-
- +
-
- +
- {% for key, usage_type in secret_usage_types.items %} {% endfor %} @@ -44,9 +44,9 @@
- +
- +
diff --git a/webvirtcloud/tests/test_unique_ids.py b/webvirtcloud/tests/test_unique_ids.py index 1dc583ae..f694371d 100644 --- a/webvirtcloud/tests/test_unique_ids.py +++ b/webvirtcloud/tests/test_unique_ids.py @@ -37,6 +37,7 @@ class UniqueIdTests(TestCase): 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("vrtManager.connection.wvmConnect.get_cpu_modes", return_value=["host-model"]), \ 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): From c58d323e215b17f82ef8cf72779c3edd54c3e308 Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 19 Oct 2026 20:05:39 +0300 Subject: [PATCH 315/765] refactor(instances): the instance page drops scripts for console fields it no longer has The console settings form lost its password, keymap and listen address fields long ago (47009d4), but its scripts stayed: show_console(), which nothing calls, change handlers for #console_passwd_gen, #console_passwd_clear and #console_keymap_clear, and two blocks that preselected #console_select_keymap and #console_select_listener_address. No template defines any of these ids, so the code matched nothing. The instance list drops a commented-out line that read #compute_select. --- instances/templates/allinstances.html | 1 - instances/templates/instance.html | 46 --------------------------- 2 files changed, 47 deletions(-) diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html index ff32f79c..e57b1328 100644 --- a/instances/templates/allinstances.html +++ b/instances/templates/allinstances.html @@ -44,7 +44,6 @@ {% if request.user.is_superuser %} - + {% block script %}{% endblock %} diff --git a/webvirtcloud/tests/test_error_focus.py b/webvirtcloud/tests/test_error_focus.py new file mode 100644 index 00000000..f58d8bd6 --- /dev/null +++ b/webvirtcloud/tests/test_error_focus.py @@ -0,0 +1,49 @@ +"""After a refused submission the page starts at the error: base.html's +script focuses the first visible invalid field, else the error message. +The script runs in Node against a stand-in document.""" + +import json +import re +import shutil +import subprocess +import unittest +from pathlib import Path + +from django.conf import settings + +SCRIPT = re.search( + r"", + Path(settings.BASE_DIR, "templates/base.html").read_text(), + re.S, +).group(1) + +HARNESS = """ +const els = %s; +let focused = null; +for (const e of els) e.focus = () => { focused = e; }; +const document = { + querySelectorAll: sel => els.filter(e => e.sel === sel), + querySelector: sel => els.find(e => e.sel === sel) || null, +}; +%s +console.log(JSON.stringify({focused: focused && focused.name, tabIndex: focused && focused.tabIndex !== undefined ? focused.tabIndex : null})); +""" + + +class ErrorFocusTests(unittest.TestCase): + @unittest.skipUnless(shutil.which("node"), "node is not installed") + def test_focus_goes_to_the_error(self): + invalid = {"sel": ".is-invalid", "offsetParent": {}, "name": "field"} + hidden = {"sel": ".is-invalid", "offsetParent": None, "name": "hidden"} + alert = {"sel": "#messages .alert-danger", "offsetParent": {}, "name": "message"} + for els, expected in ( + ([hidden, invalid, alert], {"focused": "field", "tabIndex": None}), + ([hidden, alert], {"focused": "message", "tabIndex": -1}), + ([], {"focused": None, "tabIndex": None}), + ): + with self.subTest(expected=expected["focused"]): + result = subprocess.run( + ["node", "-e", HARNESS % (json.dumps(els), SCRIPT)], capture_output=True, text=True, timeout=30 + ) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(json.loads(result.stdout), expected) From d14a31186258842029c4bef19dc40c8fcb58919a Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 19 Oct 2026 22:09:04 +0300 Subject: [PATCH 323/765] fix(instances): the disk bus list follows the device type on the create page Changing a disk's device type in the custom create form asked for its buses at /archs/undefined/machines/undefined/...: the script read the architecture and machine from a select[name=arch] and #machine-control the page does not have. The request failed (500) and the bus list kept the disk's buses, so a CD-ROM could be put on virtio. The script takes both from the page's own URL. --- instances/templates/create_instance_w2.html | 5 +-- instances/tests/test_create_page_js.py | 39 +++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 instances/tests/test_create_page_js.py diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html index b5f2ee09..5af065be 100644 --- a/instances/templates/create_instance_w2.html +++ b/instances/templates/create_instance_w2.html @@ -921,8 +921,9 @@ } function get_disk_bus_choices(compute_id, dev_idx, disk_type){ - let arch = $('select[name="arch"]').val(); - let machine = $("select[id='machine-control']").val(); + // the page's own architecture and machine type, from its URL + let arch = "{{ arch|escapejs }}"; + let machine = "{{ machine|escapejs }}"; get_diskBus_url = "/computes/" + compute_id + "/archs/" + arch + "/machines/" + machine + "/disks/" + disk_type + "/buses"; $.getJSON(get_diskBus_url, function (data) { $("#bus" + dev_idx).find('option').remove(); diff --git a/instances/tests/test_create_page_js.py b/instances/tests/test_create_page_js.py new file mode 100644 index 00000000..1f3d02f0 --- /dev/null +++ b/instances/tests/test_create_page_js.py @@ -0,0 +1,39 @@ +"""Scripts of the VM create page, rendered on libvirt's test driver and run +in Node against stand-ins.""" + +import re +import shutil +import subprocess +import unittest +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 reverse + + +class CreatePageScriptTests(TestCase): + def page(self): + conn = libvirt.open("test:///default") + self.addCleanup(conn.close) + compute = Compute.objects.create(name="testdrv", hostname="localhost", login="", password="", type=4) + self.client.force_login(get_user_model().objects.create_superuser("js", "js@example.com", "pw")) + 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=[]): + response = self.client.get(reverse("instances:create_instance", args=[compute.id, "i686", "pc"])) + self.assertEqual(response.status_code, 200) + return compute, response.content.decode() + + @unittest.skipUnless(shutil.which("node"), "node is not installed") + def test_the_disk_bus_list_is_asked_for_the_page_architecture_and_machine(self): + compute, page = self.page() + function = re.search(r"function get_disk_bus_choices\(.*?\n }\n", page, re.S).group(0) + script = "let asked; const $ = Object.assign(() => ({find: () => ({remove() {}}), append() {}, val() {}}), " \ + "{getJSON: url => { asked = url; }, each() {}});\n" + function + \ + f"get_disk_bus_choices({compute.id}, 0, 'cdrom'); console.log(asked);" + result = subprocess.run(["node", "-e", script], capture_output=True, text=True, timeout=30) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.strip(), reverse("buses", args=[compute.id, "i686", "pc", "cdrom"])) From 35468bc0fd3ba51514b44fb9eb3c954fe1357536 Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 19 Oct 2026 22:21:10 +0300 Subject: [PATCH 324/765] fix(instances): a custom VM gets the MAC addresses its create form shows The custom create form shows a MAC per network (random, or typed in), but had no mac field: the script wrote the joined list into every name="mac" input of the page, the other six-plus forms' own MAC fields, so a flavor form then sent one MAC per custom network and was refused, and the custom VM got other MACs from libvirt. The custom form gets its own hidden mac field and the script writes only there. The field took 17 characters, one MAC, so the API also refused a VM with two NICs and their MACs; it takes 255. The serializer's test sent no submission_key, so its check for more MACs than networks never ran; it does now, next to the case of two networks with two MACs. --- instances/models.py | 2 +- instances/templates/create_instance_w2.html | 5 ++++- instances/tests/test_create_instance.py | 23 +++++++++++++-------- instances/tests/test_create_page_js.py | 21 +++++++++++++++++++ 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/instances/models.py b/instances/models.py index 99883859..16d8df13 100644 --- a/instances/models.py +++ b/instances/models.py @@ -372,7 +372,7 @@ class CreateInstance(models.Model): meta_prealloc = models.BooleanField(default=False, blank=True) virtio = models.BooleanField(default=True) qemu_ga = models.BooleanField(default=False) - mac = models.CharField(max_length=17, blank=True) + mac = models.CharField(max_length=255, blank=True) # one per NIC, comma separated add_cdrom = models.CharField(max_length=16) add_input = models.CharField(max_length=16) video = models.CharField( diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html index 5af065be..fdd42491 100644 --- a/instances/templates/create_instance_w2.html +++ b/instances/templates/create_instance_w2.html @@ -413,6 +413,7 @@ +
+ {% if submitted_form == form_id %}
{% bootstrap_messages %}
{% endif %} + {% include "instances/form_errors.html" with form=vm_form %}
- +
- - - - + pattern="[a-zA-Z0-9\.\-_]+"{% error_attrs vm_form.name form_id|add:"_name" %}> + {% field_error vm_form.name form_id|add:"_name" %} + + +
{% if firmwares %}
- +
- {% for frm in firmwares %} - + {% endfor %} + {% field_error vm_form.firmware form_id|add:"_firmware" %}
{% endif %} {% if dom_caps.cpu_modes %}
- +
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} {% for model in dom_caps.cpu_custom_models %} - + {% endfor %} {% else %} - {% endif %} {% endfor %} + {% field_error vm_form.vcpu_mode form_id|add:"_vcpu_mode" %}
{% endif %}
- +
- - {% if storages %} {% for storage in storages %} - + {% endfor %} {% else %} {% endif %} + {% field_error vm_form.storage form_id|add:"_storage" %}
- +
- {% for network in networks %} - + {% endfor %} + {% field_error vm_form.networks form_id|add:"_networks" %}
@@ -184,104 +184,121 @@
- +
- + + {% field_error vm_form.mac form_id|add:"_mac" %}
- +
- {% for nwfilter in nwfilters %} - + {% endfor %} + {% field_error vm_form.nwfilter form_id|add:"_nwfilter" %}
- +
- {% for model in net_models_host %} - + {% endfor %} + {% field_error vm_form.net_model form_id|add:"_net_model" %}
- +
- {% for mode, name in cache_modes %} - {% endfor %} + {% field_error vm_form.cache_mode form_id|add:"_cache_mode" %}
- +
- {% if not videos %} {% endif %} {% for video in videos %} - + {% endfor %} + {% field_error vm_form.video form_id|add:"_video" %}
- +
- {% for addr, label in listener_addr %} - + {% endfor %} + {% field_error vm_form.listener_addr form_id|add:"_listener_addr" %}
- +
- + {% for bus in cdrom_buses %} - {% endfor %} + {% field_error vm_form.add_cdrom form_id|add:"_add_cdrom" %}
- +
- + {% for bus in input_device_buses %} - {% endfor %} + {% field_error vm_form.add_input form_id|add:"_add_input" %}
- +
- +
{% if virtio_support %}
- +
- +
{% endif %} @@ -299,7 +316,7 @@
- + {% bs_icon 'plus'%} @@ -320,60 +337,75 @@
-
+
{% csrf_token %}{% submission_key %} + + {% include "instances/form_errors.html" with form=custom_form %}
- + + {% field_error custom_form.name "custom_name" %}
{% if firmwares %}
- {% for frm in firmwares %} - + {% endfor %} + {% field_error custom_form.firmware "select_firmware" %}
{% endif %}
- + + {% field_error custom_form.vcpu "custom_vcpu" %}
{% if dom_caps.cpu_modes %}
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} {% for model in dom_caps.cpu_custom_models %} - + {% endfor %} {% else %} - {% endif %} {% endfor %} + {% field_error custom_form.vcpu_mode "custom_vcpu_mode" %}
{% endif %}
- + + {% field_error custom_form.memory "custom_memory" %}
@@ -433,103 +465,117 @@
- +
- {% for mode, name in cache_modes %} - {% endfor %} + {% field_error custom_form.cache_mode "cache_mode" %}
- {% for nwfilter in nwfilters %} - + {% endfor %} + {% field_error custom_form.nwfilter "custom_nwfilter" %}
- {% for model in net_models_host %} - + {% endfor %} + {% field_error custom_form.net_model "custom_net_model" %}
- {% if not videos %} {% endif %} {% for video in videos %} - + {% endfor %} + {% field_error custom_form.video "custom_video" %}
- {% for addr, label in listener_addr %} - + {% endfor %} + {% field_error custom_form.listener_addr "custom_listener_addr" %}
- + {% for bus in cdrom_buses %} - {% endfor %} + {% field_error custom_form.add_cdrom "add_cdrom" %}
- + {% for bus in input_device_buses %} - {% endfor %} + {% field_error custom_form.add_input "add_input" %}
- +
{% if virtio_support %}
- +
{% endif %} @@ -552,65 +598,85 @@
-
+
- {% csrf_token %}{% submission_key %} + {% csrf_token %}{% submission_key %} + + {% include "instances/form_errors.html" with form=template_form %}
- + + {% field_error template_form.name "template_name" %}
{% if firmwares %}
- {% for frm in firmwares %} - + {% endfor %} + {% field_error template_form.firmware "template_firmware" %}
{% endif %}
- + + {% field_error template_form.vcpu "template_vcpu" %}
- {% for mode in dom_caps.cpu_modes %} {% if mode == 'custom' %} {% for model in dom_caps.cpu_custom_models %} - + {% endfor %} {% else %} - {% endif %} {% endfor %} + {% field_error template_form.vcpu_mode "template_vcpu_mode" %}
- + + {% field_error template_form.memory "template_memory" %}
- {% if storages %} {% for storage in storages %} @@ -622,36 +688,45 @@
- + {% field_error template_form.template "template" %}
- {% if storages %} {% for storage in storages %} - + {% endfor %} {% else %} {% endif %} + {% field_error template_form.storage "storage" %}
- {% for network in networks %} - + {% endfor %} + {% field_error template_form.networks "template_networks" %}
- + + {% field_error template_form.mac "template_mac" %}
@@ -666,103 +741,117 @@
- +
- {% for mode, name in cache_modes %} - {% endfor %} + {% field_error template_form.cache_mode "template_cache_mode" %}
- {% for nwfilter in nwfilters %} - + {% endfor %} + {% field_error template_form.nwfilter "template_nwfilter" %}
- {% for model in net_models_host %} - + {% endfor %} + {% field_error template_form.net_model "template_net_model" %}
- {% if not videos %} {% endif %} {% for video in videos %} - + {% endfor %} + {% field_error template_form.video "template_video" %}
- {% for addr, label in listener_addr %} - + {% endfor %} + {% field_error template_form.listener_addr "template_listener_addr" %}
- + {% for bus in cdrom_buses %} - {% endfor %} + {% field_error template_form.add_cdrom "template_add_cdrom" %}
- + {% for bus in input_device_buses %} - {% endfor %} + {% field_error template_form.add_input "template_add_input" %}
- +
{% if virtio_support %}
- +
{% endif %} @@ -912,7 +1001,7 @@ function get_template_vols(compute_id, pool) { get_vol_url = "/computes/" + compute_id + "/storage/" + pool + "/volumes"; - $.getJSON(get_vol_url, function (data) { + const loading = $.getJSON(get_vol_url, function (data) { $("#template").find('option').remove(); $.each(data['vols'], function(i, item) { $("#template").append($("