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

- Make .desktop match only .desktop and not [wildcard character]desktop

Browse Source 
- Remove () from the list of accepted characters (this seemed to be causing trouble, do we need it?)

- Remove `%` from the whitelist of allowed characters in .desktop->Exec since the `%` character is interpreted as an escape by the [Desktop Entry specification](https://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/), but not by the `pipes.quote()` function used to escape the string, which allows TemplateVMs to break out of the intended shell escaping.

- Change whitespace match for `ignore_rx` to have empty lines from the Desktop Entry files excluded.
This commit is contained in:
Your Name 2017-04-18 16:33:25 +00:00
parent b629cbfe9e
commit e4d278ff00
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ fields_regexp = {
"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/_.-]*$"),
} }
@ -142,8 +142,8 @@ def get_appmenus(vm):
appmenus = {} appmenus = {}
line_rx = re.compile( line_rx = re.compile(
r"([a-zA-Z0-9.()_-]+.desktop):([a-zA-Z0-9-]+(?:\[[a-zA-Z@_]+\])?)=(.*)") 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):