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

qrexec: deny spaces in service domain name

Browse Source 
Fixes QubesOS/qubes-issues#1877
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-27 04:21:38 +02:00
parent 3acfb8e4b3
commit ad28f4df62
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qrexec/qrexec-daemon.c
View File

@ -624,7 +624,7 @@ static int find_policy_pending_slot() {
return -1; return -1;
} }
static void sanitize_name(char * untrusted_s_signed) static void sanitize_name(char * untrusted_s_signed, char *extra_allowed_chars)
{ {
unsigned char * untrusted_s; unsigned char * untrusted_s;
for (untrusted_s=(unsigned char*)untrusted_s_signed; *untrusted_s; untrusted_s++) { for (untrusted_s=(unsigned char*)untrusted_s_signed; *untrusted_s; untrusted_s++) {
@ -634,7 +634,12 @@ static void sanitize_name(char * untrusted_s_signed)
continue; continue;
if (*untrusted_s >= '0' && *untrusted_s <= '9') if (*untrusted_s >= '0' && *untrusted_s <= '9')
continue; continue;
if (*untrusted_s == '$' || *untrusted_s == '_' || *untrusted_s == '-' || *untrusted_s == '.' || *untrusted_s == ' ') if (*untrusted_s == '$' ||
*untrusted_s == '_' ||
*untrusted_s == '-' ||
*untrusted_s == '.')
continue;
if (extra_allowed_chars && strchr(extra_allowed_chars, *untrusted_s))
continue; continue;
*untrusted_s = '_'; *untrusted_s = '_';
} }
@ -661,9 +666,9 @@ static void handle_execute_service(void)
ENSURE_NULL_TERMINATED(untrusted_params.service_name); ENSURE_NULL_TERMINATED(untrusted_params.service_name);
ENSURE_NULL_TERMINATED(untrusted_params.target_domain); ENSURE_NULL_TERMINATED(untrusted_params.target_domain);
ENSURE_NULL_TERMINATED(untrusted_params.request_id.ident); ENSURE_NULL_TERMINATED(untrusted_params.request_id.ident);
sanitize_name(untrusted_params.service_name); sanitize_name(untrusted_params.service_name, "");
sanitize_name(untrusted_params.target_domain); sanitize_name(untrusted_params.target_domain, "");
sanitize_name(untrusted_params.request_id.ident); sanitize_name(untrusted_params.request_id.ident, " ");
params = untrusted_params; params = untrusted_params;
/* sanitize end */ /* sanitize end */