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

appmenus: extend allowed chars set for Windows paths

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-04-04 11:32:54 +02:00
parent 2c4aae132a
commit 123c529ffa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,8 +45,8 @@ fields_regexp = {
"Name": std_re, "Name": std_re,
"GenericName": std_re, "GenericName": std_re,
"Comment": std_re, "Comment": std_re,
"Categories": re.compile(r"^[a-zA-Z0-9/.; -]*$"), "Categories": re.compile(r"^[a-zA-Z0-9/.;:'() -]*$"),
"Exec": re.compile(r"^[a-zA-Z0-9()%&>/\\:.= -]*$"), "Exec": re.compile(r"^[a-zA-Z0-9()%&>/{}\"\\:.= -]*$"),
"Icon": re.compile(r"^[a-zA-Z0-9/_.-]*$"), "Icon": re.compile(r"^[a-zA-Z0-9/_.-]*$"),
} }
@ -88,8 +88,8 @@ def get_appmenus(vm):
row_no = 0 row_no = 0
appmenus = {} appmenus = {}
line_rx = re.compile(r"([a-zA-Z0-9-.]+.desktop):([a-zA-Z0-9-]+(?:\[[a-zA-Z@_]+\])?)=(.*)") line_rx = re.compile(r"([a-zA-Z0-9.()-]+.desktop):([a-zA-Z0-9-]+(?:\[[a-zA-Z@_]+\])?)=(.*)")
ignore_rx = re.compile(r".*([a-zA-Z0-9-.]+.desktop):(#.*|\s+)$") ignore_rx = re.compile(r".*([a-zA-Z0-9.-]+.desktop):(#.*|\s+)$")
for untrusted_line in untrusted_appmenulist: for untrusted_line in untrusted_appmenulist:
# Ignore blank lines and comments # Ignore blank lines and comments
if len(untrusted_line) == 0 or ignore_rx.match(untrusted_line): if len(untrusted_line) == 0 or ignore_rx.match(untrusted_line):