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

tools/qvm-create: reject --root-{move,copy}-from with template-based qubes

Browse Source 
Fixes QubesOS/qubes-issues#4424
This commit is contained in:
Marek Marczykowski-Górecki 2018-12-08 00:01:02 +01:00
parent f03937c51e
commit 5fe6ffc04c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qubesadmin/tests/tools/qvm_create.py
View File

@ -99,7 +99,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
with tempfile.NamedTemporaryFile() as root_file: with tempfile.NamedTemporaryFile() as root_file:
root_file.file.write(b'root data') root_file.file.write(b'root data')
root_file.file.flush() root_file.file.flush()
self.app.expected_calls[('dom0', 'admin.vm.Create.AppVM', self.app.expected_calls[('dom0', 'admin.vm.Create.StandaloneVM',
None, b'name=new-vm label=red')] = b'0\x00' None, b'name=new-vm label=red')] = b'0\x00'
self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \ self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\nblue\n' b'0\x00red\nblue\n'
@ -117,7 +117,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('new-vm', 'admin.vm.volume.Import', 'root', b'root data')] = \ ('new-vm', 'admin.vm.volume.Import', 'root', b'root data')] = \
b'0\0' b'0\0'
qubesadmin.tools.qvm_create.main(['-l', 'red', qubesadmin.tools.qvm_create.main(['-l', 'red', '-C', 'StandaloneVM',
'--root-copy-from=' + root_file.name, 'new-vm'], '--root-copy-from=' + root_file.name, 'new-vm'],
app=self.app) app=self.app)
self.assertAllCalled() self.assertAllCalled()
@ -127,7 +127,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
with tempfile.NamedTemporaryFile(delete=False) as root_file: with tempfile.NamedTemporaryFile(delete=False) as root_file:
root_file.file.write(b'root data') root_file.file.write(b'root data')
root_file.file.flush() root_file.file.flush()
self.app.expected_calls[('dom0', 'admin.vm.Create.AppVM', self.app.expected_calls[('dom0', 'admin.vm.Create.StandaloneVM',
None, b'name=new-vm label=red')] = b'0\x00' None, b'name=new-vm label=red')] = b'0\x00'
self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \ self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\nblue\n' b'0\x00red\nblue\n'
@ -145,7 +145,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('new-vm', 'admin.vm.volume.Import', 'root', b'root data')] = \ ('new-vm', 'admin.vm.volume.Import', 'root', b'root data')] = \
b'0\0' b'0\0'
qubesadmin.tools.qvm_create.main(['-l', 'red', qubesadmin.tools.qvm_create.main(['-l', 'red', '-C', 'StandaloneVM',
'--root-move-from=' + root_file.name, 'new-vm'], '--root-move-from=' + root_file.name, 'new-vm'],
app=self.app) app=self.app)
self.assertAllCalled() self.assertAllCalled()
@ -156,7 +156,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
root_file.file.write(b'root data') root_file.file.write(b'root data')
root_file.file.flush() root_file.file.flush()
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
qubesadmin.tools.qvm_create.main(['-l', 'red', qubesadmin.tools.qvm_create.main(['-l', 'red', '-C', 'StandaloneVM',
'--root-copy-from=' + root_file.name, '--root-copy-from=' + root_file.name,
'--root-move-from=' + root_file.name, '--root-move-from=' + root_file.name,
'new-vm'], 'new-vm'],
@ -166,7 +166,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
def test_008_root_invalid_path(self): def test_008_root_invalid_path(self):
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
qubesadmin.tools.qvm_create.main(['-l', 'red', qubesadmin.tools.qvm_create.main(['-l', 'red', '-C', 'StandaloneVM',
'--root-copy-from=/invalid', 'new-vm'], '--root-copy-from=/invalid', 'new-vm'],
app=self.app) app=self.app)
self.assertAllCalled() self.assertAllCalled()
@ -185,7 +185,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
with tempfile.NamedTemporaryFile() as root_file: with tempfile.NamedTemporaryFile() as root_file:
root_file.file.write(b'root data') root_file.file.write(b'root data')
root_file.file.flush() root_file.file.flush()
self.app.expected_calls[('dom0', 'admin.vm.Create.AppVM', self.app.expected_calls[('dom0', 'admin.vm.Create.StandaloneVM',
None, b'name=new-vm label=red')] = b'0\x00' None, b'name=new-vm label=red')] = b'0\x00'
self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \ self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
b'0\x00red\nblue\n' b'0\x00red\nblue\n'
@ -206,7 +206,7 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
self.app.expected_calls[ self.app.expected_calls[
('new-vm', 'admin.vm.volume.Import', 'root', b'root data')] = \ ('new-vm', 'admin.vm.volume.Import', 'root', b'root data')] = \
b'0\0' b'0\0'
qubesadmin.tools.qvm_create.main(['-l', 'red', qubesadmin.tools.qvm_create.main(['-l', 'red', '-C', 'StandaloneVM',
'--root-copy-from=' + root_file.name, 'new-vm'], '--root-copy-from=' + root_file.name, 'new-vm'],
app=self.app) app=self.app)
self.assertAllCalled() self.assertAllCalled()
@ -328,3 +328,15 @@ class TC_00_qvm_create(qubesadmin.tests.QubesTestCase):
app=self.app) app=self.app)
self.assertIn('red, blue', stderr.getvalue()) self.assertIn('red, blue', stderr.getvalue())
self.assertAllCalled() self.assertAllCalled()
def test_013_root_copy_from_template_based(self):
with tempfile.NamedTemporaryFile() as root_file:
root_file.file.write(b'root data')
root_file.file.flush()
with self.assertRaises(SystemExit):
with qubesadmin.tests.tools.StderrBuffer() as stderr:
qubesadmin.tools.qvm_create.main(['-l', 'red',
'--root-copy-from=' + root_file.name, 'new-vm'],
app=self.app)
self.assertIn('--root-copy-from', stderr.getvalue())
self.assertAllCalled()

6
qubesadmin/tools/qvm_create.py
View File

@ -124,6 +124,12 @@ def main(args=None, app=None):
parser.error( parser.error(
'File pointed by --root-copy-from/--root-move-from does not exist') 'File pointed by --root-copy-from/--root-move-from does not exist')
# those are known of non-persistent root, do not list those with known
# persistent root, as an extension may add new classes
if root_source_path and args.cls in ('AppVM', 'DispVM'):
parser.error('--root-copy-from/--root-move-from used but this qube '
'does not have own \'root\' volume (uses template\'s one)')
try: try:
args.app.get_label(args.properties['label']) args.app.get_label(args.properties['label'])
except KeyError: except KeyError: