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

NotifyTools: handle default user setting

Browse Source 
If the VM provides 'default-user' setting - save it to the VM settings.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-01 02:32:32 +01:00
parent 5291227de3
commit 8200b15c61
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes-rpc/qubes-notify-tools
View File

@ -1,6 +1,7 @@
#!/usr/bin/python2 #!/usr/bin/python2
import os import os
import re
import sys import sys
from qubes.qubes import QubesVmCollection,QubesException,QubesHVm from qubes.qubes import QubesVmCollection,QubesException,QubesHVm
from qubes.qubes import xs from qubes.qubes import xs
@ -35,6 +36,8 @@ def main():
untrusted_qrexec = xs.read('', '{0}/qrexec'.format(xs_path)) untrusted_qrexec = xs.read('', '{0}/qrexec'.format(xs_path))
# gui agent presence (0 or 1) # gui agent presence (0 or 1)
untrusted_gui = xs.read('', '{0}/gui'.format(xs_path)) untrusted_gui = xs.read('', '{0}/gui'.format(xs_path))
# default user for qvm-run etc
untrusted_user = xs.read('', '{0}/default-user'.format(xs_path))
if untrusted_version is None: if untrusted_version is None:
# tools didn't advertised its features; it's strange that this # tools didn't advertised its features; it's strange that this
@ -56,10 +59,19 @@ def main():
else: else:
gui = int(untrusted_gui) gui = int(untrusted_gui)
if untrusted_user is not None:
if re.match(r'^[a-zA-Z0-9-]+$', untrusted_user):
user = untrusted_user
else:
user = None
# Let the tools to be able to enable *or disable* each particular component # Let the tools to be able to enable *or disable* each particular component
source_vm.qrexec_installed = qrexec > 0 source_vm.qrexec_installed = qrexec > 0
source_vm.guiagent_installed = gui > 0 source_vm.guiagent_installed = gui > 0
if user:
source_vm.default_user = user
qvm_collection.save() qvm_collection.save()
except Exception as e: except Exception as e:
print >> sys.stderr, e.message print >> sys.stderr, e.message