QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appmenus: don't output untrusted strings on terminal

Browse Source 
Especially those which failed verification.
This commit is contained in:
Marek Marczykowski-Górecki 2014-04-19 16:46:03 +02:00
parent 0afaa60093
commit ffd8db5d06
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appmenus-scripts/qubes-receive-appmenus
View File

@ -97,6 +97,7 @@ def get_appmenus(vm):
# use search instead of match to skip file path # use search instead of match to skip file path
untrusted_m = line_rx.search(untrusted_line) untrusted_m = line_rx.search(untrusted_line)
if untrusted_m: if untrusted_m:
filename = untrusted_m.group(1)
untrusted_key = untrusted_m.group(2) untrusted_key = untrusted_m.group(2)
untrusted_value = untrusted_m.group(3) untrusted_value = untrusted_m.group(3)
# Look only at predefined keys # Look only at predefined keys
@ -105,17 +106,14 @@ def get_appmenus(vm):
# now values are sanitized # now values are sanitized
key = untrusted_key key = untrusted_key
value = untrusted_value value = untrusted_value
filename = untrusted_m.group(1)
if not appmenus.has_key(filename): if not appmenus.has_key(filename):
appmenus[filename] = {} appmenus[filename] = {}
appmenus[filename][key]=value appmenus[filename][key]=value
else: else:
print >>sys.stderr, "Warning: ignoring key %s: %s" % (untrusted_key, untrusted_value) print >>sys.stderr, "Warning: ignoring key %s of %s" % (untrusted_key, filename)
# else: ignore this key # else: ignore this key
else:
print >>sys.stderr, "Warning: ignoring line: %s" % (untrusted_line)
return appmenus return appmenus