Skip to content

tools: fix vm.run(user="root") on template imported from R4.2 (cont) #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marmarek wants to merge 1 commit into
base: main
Choose a base branch
from
+54 −2
Open

tools: fix vm.run(user="root") on template imported from R4.2 (cont) #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions qubesadmin/tests/vm/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,51 @@ def test_011_run_windows(self):
('test-vm', 'qubes.VMShell', b'some command& exit\n'),
])

def test_012_run_linux_root(self):
self.app.expected_calls[
("test-vm", "admin.vm.feature.CheckWithTemplate", "os", None)
] = b"2\x00QubesFeatureNotFoundError\x00\x00Feature 'os' not set\x00"
self.app.expected_calls[
(
"test-vm",
"admin.vm.feature.CheckWithTemplate",
"supported-rpc.qubes.VMRootExec",
None,
)
] = (
b"2\x00QubesFeatureNotFoundError\x00\x00"
b"Feature 'supported-rpc.qubes.VMRootExec' not set\x00"
)
self.vm.run("some command", user="root")
self.assertEqual(
self.app.service_calls,
[
("test-vm", "qubes.VMShell", {"user": "root"}),
("test-vm", "qubes.VMShell", b"some command; exit\n"),
],
)

def test_013_run_linux_root_vmrootshell(self):
self.app.expected_calls[
("test-vm", "admin.vm.feature.CheckWithTemplate", "os", None)
] = b"2\x00QubesFeatureNotFoundError\x00\x00Feature 'os' not set\x00"
self.app.expected_calls[
(
"test-vm",
"admin.vm.feature.CheckWithTemplate",
"supported-rpc.qubes.VMRootExec",
None,
)
] = b"0\x001"
self.vm.run("some command", user="root")
self.assertEqual(
self.app.service_calls,
[
("test-vm", "qubes.VMRootShell", {}),
("test-vm", "qubes.VMRootShell", b"some command; exit\n"),
],
)

def test_015_run_with_args_shell(self):
self.app.expected_calls[
('test-vm', 'admin.vm.feature.CheckWithTemplate', 'vmexec',
Expand Down
11 changes: 9 additions & 2 deletions qubesadmin/vm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,20 @@ def run(self, command, input=None, **kwargs):
# pylint: disable=redefined-builtin
try:
service = "qubes.VMShell"
if kwargs.get("user", None) == "root":
# intentionally check for qubes.VMRootExec, as this is when
# qubes.VMRootShell got force-user='root' in its config
if kwargs.get(
"user", None
) == "root" and self.features.check_with_template(
"supported-rpc.qubes.VMRootExec", False
):

kwargs.pop("user")
service = "qubes.VMRootShell"
return self.run_service_for_stdio(
service,
input=self.prepare_input_for_vmshell(command, input),
**kwargs
**kwargs,
)
except subprocess.CalledProcessError as e:
e.cmd = command
Expand Down