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

Separate whitelist entries with spaces instead of newlines.

Browse Source
This commit is contained in:
WillyPillow 2020-06-30 12:08:16 +08:00
parent 9d9ee6a4b7
commit 6c7360f25c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesadmin/tools/qvm_template_postprocess.py
View File

@ -155,16 +155,19 @@ def import_appmenus(vm, source_dir):
else: else:
cmd_prefix = [] cmd_prefix = []
# store the whitelists in VM features
# separated by spaces should be ok as there should be no spaces in the file
# name according to the FreeDesktop spec
with open(os.path.join(source_dir, 'vm-whitelisted-appmenus.list'), 'r') \ with open(os.path.join(source_dir, 'vm-whitelisted-appmenus.list'), 'r') \
as f: as f:
vm.features['default-whitelist'] = f.read() vm.features['default-whitelist'] = ' '.join([x.rstrip() for x in f])
with open(os.path.join(source_dir, 'whitelisted-appmenus.list'), 'r') \ with open(os.path.join(source_dir, 'whitelisted-appmenus.list'), 'r') \
as f: as f:
vm.features['whitelist'] = f.read() vm.features['whitelist'] = ' '.join([x.rstrip() for x in f])
with open( with open(
os.path.join(source_dir, 'netvm-whitelisted-appmenus.list'), 'r') \ os.path.join(source_dir, 'netvm-whitelisted-appmenus.list'), 'r') \
as f: as f:
vm.features['netvm-whitelist'] = f.read() vm.features['netvm-whitelist'] = ' '.join([x.rstrip() for x in f])
# TODO: change this to qrexec calls to GUI VM, when GUI VM will be # TODO: change this to qrexec calls to GUI VM, when GUI VM will be
# implemented # implemented