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

core: reject non-NetVM for vm.netvm and vm.dispvm_netvm

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-04-06 02:55:26 +02:00
parent 75e9c8aff0
commit 1ab4663293
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core-modules/000QubesVm.py
View File

@ -419,6 +419,9 @@ class QubesVm(object):
def _set_netvm(self, new_netvm): def _set_netvm(self, new_netvm):
self.log.debug('netvm = {!r}'.format(new_netvm)) self.log.debug('netvm = {!r}'.format(new_netvm))
if new_netvm and not new_netvm.is_netvm():
raise ValueError("Vm {!r} does not provide network".format(
new_netvm))
if self.is_running() and new_netvm is not None and not new_netvm.is_running(): if self.is_running() and new_netvm is not None and not new_netvm.is_running():
raise QubesException("Cannot dynamically attach to stopped NetVM") raise QubesException("Cannot dynamically attach to stopped NetVM")
if self.netvm is not None: if self.netvm is not None:
@ -611,6 +614,9 @@ class QubesVm(object):
@dispvm_netvm.setter @dispvm_netvm.setter
def dispvm_netvm(self, value): def dispvm_netvm(self, value):
if value and not value.is_netvm():
raise ValueError("Vm {!r} does not provide network".format(
value))
self._dispvm_netvm = value self._dispvm_netvm = value
@property @property