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

vm: fix handling policy deny on admin.vm.List

Browse Source 
vm.get_power_state() have specifically documented 'NA' state for cases
when it's unable to get VM's power state. Use this when qrexec policy
forbid checking it.

Reported by @pietrushnic
Fixes QubesOS/qubes-issues#3179
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-16 01:20:27 +02:00
parent 17670eae1b
commit 2f7d1ca476
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesadmin/vm/__init__.py
View File

@ -168,11 +168,14 @@ class QubesVM(qubesadmin.base.PropertyHolder):
'''
vm_list_info = [line
for line in self.qubesd_call(
self._method_dest, 'admin.vm.List', None, None
).decode('ascii').split('\n')
if line.startswith(self._method_dest+' ')]
try:
vm_list_info = [line
for line in self.qubesd_call(
self._method_dest, 'admin.vm.List', None, None
).decode('ascii').split('\n')
if line.startswith(self._method_dest+' ')]
except qubesadmin.exc.QubesDaemonNoResponseError:
return 'NA'
assert len(vm_list_info) == 1
# name class=... state=... other=...
# NOTE: when querying dom0, we get whole list
@ -206,7 +209,7 @@ class QubesVM(qubesadmin.base.PropertyHolder):
:rtype: bool
'''
return self.get_power_state() != 'Halted'
return self.get_power_state() not in ('Halted', 'NA')
def is_networked(self):
'''Check whether this VM can reach network (firewall notwithstanding).