Always pass a service argument

The argument is not really optional, and not passing one leads to bugs on the VM side.
QubesOS · Jan 8, 2025 · f3307e1 · f3307e1
1 parent 3b9da29
commit f3307e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/qubesadmin/app.py b/qubesadmin/app.py
@@ -861,8 +861,15 @@ def run_service(self, dest, service, user=None, *, filter_esc=False,
         kwargs.setdefault('stdout', subprocess.PIPE)
         kwargs.setdefault('stderr', subprocess.PIPE)
         proc = subprocess.Popen(
-            [qubesadmin.config.QREXEC_CLIENT] + qrexec_opts + [
-                '{}:QUBESRPC {} dom0'.format(user, service)], **kwargs)
+            [qubesadmin.config.QREXEC_CLIENT]
+            + qrexec_opts
+            + [
+                "{}:QUBESRPC {}{} dom0".format(
+                    user, service, "" if "+" in service else "+"
+                )
+            ],
+            **kwargs,
+        )
         return proc
 
 

diff --git a/qubesadmin/tests/app.py b/qubesadmin/tests/app.py
@@ -999,7 +999,7 @@ def test_010_run_service(self):
             self.app.run_service('some-vm', 'service.name')
             mock_proc.assert_called_once_with([
                 qubesadmin.config.QREXEC_CLIENT,
-                '-d', 'some-vm', '-T', 'DEFAULT:QUBESRPC service.name dom0'],
+                '-d', 'some-vm', '-T', 'DEFAULT:QUBESRPC service.name+ dom0'],
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
 
@@ -1013,7 +1013,7 @@ def test_011_run_service_filter_esc(self):
             mock_proc.assert_called_once_with([
                 qubesadmin.config.QREXEC_CLIENT,
                 '-d', 'some-vm', '-t', '-T',
-                'DEFAULT:QUBESRPC service.name dom0'],
+                'DEFAULT:QUBESRPC service.name+ dom0'],
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
 
@@ -1028,7 +1028,7 @@ def test_012_run_service_user(self):
             mock_proc.assert_called_once_with([
                 qubesadmin.config.QREXEC_CLIENT,
                 '-d', 'some-vm', '-T',
-                'user:QUBESRPC service.name dom0'],
+                'user:QUBESRPC service.name+ dom0'],
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)