vm: add run_service(..., connection_timeout) argument

The connection_timeout value is about just establishing connection. It's
rather short by default (5s), which is normally fine. But there are
cases where it needs to be longer, for example when VM is resuming from
sleep.

QubesOS/qubes-issues#9942

Author: marmarek

qubes/tests/vm/qubesvm.py

@@ -2975,6 +2975,24 @@ def test_700_run_service(self, mock_subprocess):
             )
             self.assertFalse(start_mock.called)
 
+        mock_subprocess.reset_mock()
+        start_mock.reset_mock()
+        with self.subTest("connection_timeout"):
+            vm.is_running = lambda: True
+            vm.is_qrexec_running = lambda stubdom=False: True
+            self.loop.run_until_complete(
+                vm.run_service("test.service", connection_timeout=10)
+            )
+            mock_subprocess.assert_called_once_with(
+                "/usr/bin/qrexec-client",
+                "-d",
+                "test-inst-vm",
+                "-w",
+                "10",
+                "user:QUBESRPC test.service dom0",
+            )
+            self.assertFalse(start_mock.called)
+
     @unittest.mock.patch("qubes.vm.qubesvm.QubesVM.run")
     def test_710_run_for_stdio(self, mock_run):
         vm = self.get_vm(cls=qubes.vm.standalonevm.StandaloneVM, name="vm")

qubes/vm/qubesvm.py

@@ -1769,6 +1769,7 @@ async def run_service(
         filter_esc=False,
         autostart=False,
         gui=False,
+        connection_timeout=None,
         **kwargs,
     ):
         """Run service on this VM
@@ -1782,6 +1783,8 @@ async def run_service(
         :param bool autostart: if :py:obj:`True`, machine will be started if \
             it is not running
         :param bool gui: when autostarting, also start gui daemon
+        :param int connection_timeout: override default qrexec connection
+            timeout (in seconds)
         :rtype: asyncio.subprocess.Process
 
         .. note::
@@ -1827,6 +1830,7 @@ async def run_service(
             qubes.config.system_path["qrexec_client_path"],
             "-d",
             str(name),
+            *(("-w", str(connection_timeout)) if connection_timeout else ()),
             *(("-t", "-T") if filter_esc else ()),
             "{}:QUBESRPC {} {}".format(user, service, source),
             **kwargs,