Skip to content

Return empty string when device denied is None #776

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

Merged
marmarek merged 1 commit into from
Feb 6, 2026
+9 −3
Merged

Return empty string when device denied is None #776

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
4 changes: 4 additions & 0 deletions qubes/tests/api_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4252,6 +4252,10 @@ def test_660_vm_device_denied_list_empty(self):
self.assertEqual(actual, "")
self.assertFalse(self.app.save.called)

self.vm.devices_denied = None
self.assertEqual(self.vm.devices_denied, "")
self.assertFalse(self.app.save.called)

def test_661_vm_device_denied_list(self):
self.vm.devices_denied = "b******p012345pff**2*"
actual = self.call_mgmt_func(
Expand Down
8 changes: 5 additions & 3 deletions qubes/vm/qubesvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,12 @@ def _setter_default_user(self, prop, value):

def _setter_denied_list(self, prop, value):
"""Helper for setting denied list"""
value = str(value)
if len(value) == 0:
return value
# Although the property has type str, loading an empty value from XML leads
# to None.
if not value:
return ""

value = str(value)
# remove duplicates
value = "".join(
sorted(map(repr, set(DeviceInterface.from_str_bulk(value))))
Expand Down