Merge remote-tracking branch 'origin/pr/317'

* origin/pr/317: Avoid spaces in values for `admin.vm.Create` calls
QubesOS · Nov 14, 2024 · 32e977b · 32e977b
2 parents 1a6399b + 177cd2e
commit 32e977b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/qubesadmin/app.py b/qubesadmin/app.py
@@ -340,6 +340,8 @@ def add_new_vm(self, cls, name, label, template=None, pool=None,
         elif template is not None:
             template = str(template)
 
+        if ' ' in name:
+            raise ValueError(f'Qube name could not contain space: {name}')
         if pool and pools:
             raise ValueError('only one of pool= and pools= can be used')
 

diff --git a/qubesadmin/tests/app.py b/qubesadmin/tests/app.py
@@ -863,6 +863,10 @@ def test_050_automatic_reset_cache(self):
         self.assertEqual(vm.get_power_state(), 'Halted')
         self.assertAllCalled()
 
+    def test_051_space_in_vmname(self):
+        with self.assertRaises(ValueError):
+            self.app.add_new_vm('AppVM', 'VM Name with spaces', 'red')
+
 
 class TC_20_QubesLocal(unittest.TestCase):
     def setUp(self):