Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api/admin: fix error message when refusing to create template on template

Browse Source 
Fixes QubesOS/qubes-issues#4463
This commit is contained in:
Marek Marczykowski-Górecki 2018-11-02 17:36:55 +01:00
parent e8201eebba
commit 68dffb6895
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/api/admin.py
View File

@ -992,12 +992,15 @@ class QubesAdminAPI(qubes.api.AbstractQubesAPI):
# if argument is given, it needs to be a valid template, and only
# when given VM class do need a template
if hasattr(vm_class, 'template'):
if self.arg:
self.enforce(self.arg in self.app.domains)
if self.arg:
if hasattr(vm_class, 'template'):
if self.arg not in self.app.domains:
raise qubes.api.PermissionDenied(
'Template {} does not exist'.format(self.arg))
kwargs['template'] = self.app.domains[self.arg]
else:
self.enforce(not self.arg)
else:
raise qubes.exc.QubesValueError(
'{} cannot be based on template'.format(vm_type))
for untrusted_param in untrusted_payload.decode('ascii',
errors='strict').split(' '):

2
qubes/tests/api_admin.py
View File

@ -1168,7 +1168,7 @@ class TC_00_VMs(AdminAPITestCase):
@unittest.mock.patch('qubes.storage.Storage.create')
def test_331_vm_create_standalone_spurious_template(self, storage_mock):
storage_mock.side_effect = self.dummy_coro
with self.assertRaises(qubes.api.PermissionDenied):
with self.assertRaises(qubes.exc.QubesValueError):
self.call_mgmt_func(b'admin.vm.Create.StandaloneVM',
b'dom0', b'test-template', b'name=test-vm2 label=red')