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

vm/DispVM: use 'qrexec_timeout' also for call connection timeout

Browse Source 
When calling a service in DispVM, the connection is established only
after session is ready (if required for given service). qrexec-client by
default use 5s here, which is too low depending on hardware. Use
'qrexec_timeout' property here for DispVM case.

Fixes QubesOS/qubes-issues#3012
This commit is contained in:
Marek Marczykowski-Górecki 2018-01-12 19:57:45 +01:00 committed by Rusty Bird
parent 3fcae995df
commit c98b33bcd6
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubesadmin/app.py
View File

@ -494,6 +494,7 @@ class QubesLocal(QubesBase):
:param str user: username to run service as :param str user: username to run service as
:param str localcmd: Command to connect stdin/stdout to :param str localcmd: Command to connect stdin/stdout to
:param bool wait: wait for remote process to finish :param bool wait: wait for remote process to finish
:param int connect_timeout: qrexec client connection timeout
:rtype: subprocess.Popen :rtype: subprocess.Popen
''' '''
@ -516,6 +517,8 @@ class QubesLocal(QubesBase):
user = 'DEFAULT' user = 'DEFAULT'
if not wait: if not wait:
qrexec_opts.extend(['-e']) qrexec_opts.extend(['-e'])
if 'connect_timeout' in kwargs:
qrexec_opts.extend(['-w', str(kwargs.pop('connect_timeout'))])
kwargs.setdefault('stdin', subprocess.PIPE) kwargs.setdefault('stdin', subprocess.PIPE)
kwargs.setdefault('stdout', subprocess.PIPE) kwargs.setdefault('stdout', subprocess.PIPE)
kwargs.setdefault('stderr', subprocess.PIPE) kwargs.setdefault('stderr', subprocess.PIPE)

8
qubesadmin/tests/tools/qvm_run.py
View File

@ -343,6 +343,9 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
b'0\0disp123' b'0\0disp123'
self.app.expected_calls[('disp123', 'admin.vm.Kill', None, None)] = \ self.app.expected_calls[('disp123', 'admin.vm.Kill', None, None)] = \
b'0\0' b'0\0'
self.app.expected_calls[
('disp123', 'admin.vm.property.Get', 'qrexec_timeout', None)] = \
b'0\0default=yes type=int 30'
ret = qubesadmin.tools.qvm_run.main( ret = qubesadmin.tools.qvm_run.main(
['--dispvm', '--service', 'test.service'], app=self.app) ['--dispvm', '--service', 'test.service'], app=self.app)
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
@ -352,6 +355,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,
'user': None, 'user': None,
'connect_timeout': 30,
}), }),
('disp123', 'test.service', b''), ('disp123', 'test.service', b''),
]) ])
@ -364,6 +368,9 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
b'0\0disp123' b'0\0disp123'
self.app.expected_calls[('disp123', 'admin.vm.Kill', None, None)] = \ self.app.expected_calls[('disp123', 'admin.vm.Kill', None, None)] = \
b'0\0' b'0\0'
self.app.expected_calls[
('disp123', 'admin.vm.property.Get', 'qrexec_timeout', None)] = \
b'0\0default=yes type=int 30'
ret = qubesadmin.tools.qvm_run.main( ret = qubesadmin.tools.qvm_run.main(
['--dispvm=test-vm', '--service', 'test.service'], app=self.app) ['--dispvm=test-vm', '--service', 'test.service'], app=self.app)
self.assertEqual(ret, 0) self.assertEqual(ret, 0)
@ -373,6 +380,7 @@ class TC_00_qvm_run(qubesadmin.tests.QubesTestCase):
'stdout': subprocess.DEVNULL, 'stdout': subprocess.DEVNULL,
'stderr': subprocess.DEVNULL, 'stderr': subprocess.DEVNULL,
'user': None, 'user': None,
'connect_timeout': 30,
}), }),
('disp123', 'test.service', b''), ('disp123', 'test.service', b''),
]) ])

10
qubesadmin/tests/vm/dispvm.py
View File

@ -28,11 +28,14 @@ class TC_00_Dispvm(qubesadmin.tests.QubesTestCase):
('dom0', 'admin.vm.CreateDisposable', None, None)] = b'0\0disp123' ('dom0', 'admin.vm.CreateDisposable', None, None)] = b'0\0disp123'
self.app.expected_calls[ self.app.expected_calls[
('disp123', 'admin.vm.Kill', None, None)] = b'0\0' ('disp123', 'admin.vm.Kill', None, None)] = b'0\0'
self.app.expected_calls[
('disp123', 'admin.vm.property.Get', 'qrexec_timeout', None)] = \
b'0\0default=yes type=int 30'
vm = qubesadmin.vm.DispVM.from_appvm(self.app, None) vm = qubesadmin.vm.DispVM.from_appvm(self.app, None)
(stdout, stderr) = vm.run_service_for_stdio('test.service') (stdout, stderr) = vm.run_service_for_stdio('test.service')
vm.cleanup() vm.cleanup()
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('disp123', 'test.service', {}), ('disp123', 'test.service', {'connect_timeout': 30}),
('disp123', 'test.service', b''), ('disp123', 'test.service', b''),
]) ])
self.assertAllCalled() self.assertAllCalled()
@ -44,11 +47,14 @@ class TC_00_Dispvm(qubesadmin.tests.QubesTestCase):
b'0\0disp123' b'0\0disp123'
self.app.expected_calls[ self.app.expected_calls[
('disp123', 'admin.vm.Kill', None, None)] = b'0\0' ('disp123', 'admin.vm.Kill', None, None)] = b'0\0'
self.app.expected_calls[
('disp123', 'admin.vm.property.Get', 'qrexec_timeout', None)] = \
b'0\0default=yes type=int 30'
vm = qubesadmin.vm.DispVM.from_appvm(self.app, 'test-vm') vm = qubesadmin.vm.DispVM.from_appvm(self.app, 'test-vm')
(stdout, stderr) = vm.run_service_for_stdio('test.service') (stdout, stderr) = vm.run_service_for_stdio('test.service')
vm.cleanup() vm.cleanup()
self.assertEqual(self.app.service_calls, [ self.assertEqual(self.app.service_calls, [
('disp123', 'test.service', {}), ('disp123', 'test.service', {'connect_timeout': 30}),
('disp123', 'test.service', b''), ('disp123', 'test.service', b''),
]) ])
self.assertAllCalled() self.assertAllCalled()

3
qubesadmin/vm/__init__.py
View File

@ -350,6 +350,9 @@ class DispVMWrapper(QubesVM):
'admin.vm.CreateDisposable') 'admin.vm.CreateDisposable')
dispvm = dispvm.decode('ascii') dispvm = dispvm.decode('ascii')
self._method_dest = dispvm self._method_dest = dispvm
# Service call may wait for session start, give it more time
# than default 5s
kwargs['connect_timeout'] = self.qrexec_timeout
return super(DispVMWrapper, self).run_service(service, **kwargs) return super(DispVMWrapper, self).run_service(service, **kwargs)
def cleanup(self): def cleanup(self):