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

qrexec: add support for service argument

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

2
qrexec/qrexec-daemon.c
View File

@ -666,7 +666,7 @@ 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;

7
qrexec/qrexec-policy
View File

@ -50,9 +50,12 @@ def line_to_dict(line):
def read_policy_file(service_name): def read_policy_file(service_name):
policy_file=POLICY_FILE_DIR+"/"+service_name policy_file = os.path.join(POLICY_FILE_DIR, service_name)
if not os.path.isfile(policy_file): if not os.path.isfile(policy_file):
policy_file=DEPRECATED_POLICY_FILE_DIR+"/"+service_name # fallback to policy without specific argument set (if any)
policy_file = os.path.join(POLICY_FILE_DIR, service_name.split("+")[0])
if not os.path.isfile(policy_file):
policy_file = os.path.join(DEPRECATED_POLICY_FILE_DIR, service_name)
if not os.path.isfile(policy_file): if not os.path.isfile(policy_file):
return None return None
print >>sys.stderr, "RPC service '%s' uses deprecated policy location, please move to %s" % (service_name, POLICY_FILE_DIR) print >>sys.stderr, "RPC service '%s' uses deprecated policy location, please move to %s" % (service_name, POLICY_FILE_DIR)