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

block: improve handling device name and description

Browse Source 
Don't fail when device have no description. Also, handle device name
consistently - there is already name_re defined.
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-11 13:54:32 +02:00
parent e0cadfdd67
commit f6d10ec243
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubes/ext/block.py
View File

@ -58,6 +58,8 @@ class BlockDevice(qubes.devices.DeviceInfo):
string.ascii_letters + string.digits + '()+,-.:=_/ '} string.ascii_letters + string.digits + '()+,-.:=_/ '}
untrusted_desc = self.backend_domain.untrusted_qdb.read( untrusted_desc = self.backend_domain.untrusted_qdb.read(
'/qubes-block-devices/{}/desc'.format(self.ident)) '/qubes-block-devices/{}/desc'.format(self.ident))
if not untrusted_desc:
return ''
desc = ''.join((chr(c) if c in safe_set else '_') desc = ''.join((chr(c) if c in safe_set else '_')
for c in untrusted_desc) for c in untrusted_desc)
self._description = desc self._description = desc
@ -136,14 +138,13 @@ class BlockDeviceExtension(qubes.ext.Extension):
def on_device_list_block(self, vm, event): def on_device_list_block(self, vm, event):
# pylint: disable=unused-argument,no-self-use # pylint: disable=unused-argument,no-self-use
safe_set = string.ascii_letters + string.digits
if not vm.is_running(): if not vm.is_running():
return return
untrusted_qubes_devices = vm.untrusted_qdb.list('/qubes-block-devices/') untrusted_qubes_devices = vm.untrusted_qdb.list('/qubes-block-devices/')
untrusted_idents = set(untrusted_path.split('/', 3)[2] untrusted_idents = set(untrusted_path.split('/', 3)[2]
for untrusted_path in untrusted_qubes_devices) for untrusted_path in untrusted_qubes_devices)
for untrusted_ident in untrusted_idents: for untrusted_ident in untrusted_idents:
if not all(c in safe_set for c in untrusted_ident): if not name_re.match(untrusted_ident):
msg = ("%s vm's device path name contains unsafe characters. " msg = ("%s vm's device path name contains unsafe characters. "
"Skipping it.") "Skipping it.")
vm.log.warning(msg % vm.name) vm.log.warning(msg % vm.name)