diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-02-21 05:18:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 05:18:42 -0500 |
| commit | f68d2fb33c433d13def0921db561eb23d400683c (patch) | |
| tree | cd8ec8565a63cd5b047e45b001debed16d6a2bdd /sway/commands/permit.c | |
| parent | 76614efb16527420017291cd47de176b11440d38 (diff) | |
| parent | 276630eb9632fe2323d02c5d4113062830c49082 (diff) | |
Merge pull request #1080 from SirCmpwn/ipc-security
Revise IPC security configuration
Diffstat (limited to 'sway/commands/permit.c')
| -rw-r--r-- | sway/commands/permit.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sway/commands/permit.c b/sway/commands/permit.c index 1b2a30bf..e2bec2e2 100644 --- a/sway/commands/permit.c +++ b/sway/commands/permit.c @@ -19,7 +19,6 @@ static enum secure_feature get_features(int argc, char **argv, { "fullscreen", FEATURE_FULLSCREEN }, { "keyboard", FEATURE_KEYBOARD }, { "mouse", FEATURE_MOUSE }, - { "ipc", FEATURE_IPC }, }; for (int i = 1; i < argc; ++i) { @@ -63,19 +62,13 @@ struct cmd_results *cmd_permit(int argc, char **argv) { if ((error = checkarg(argc, "permit", EXPECTED_MORE_THAN, 1))) { return error; } - - if (!current_config_path || strcmp(SYSCONFDIR "/sway/security", current_config_path) != 0) { - return cmd_results_new(CMD_INVALID, "permit", - "This command is only permitted to run from " SYSCONFDIR "/sway/security"); + if ((error = check_security_config())) { + return error; } struct feature_policy *policy = get_policy(argv[0]); policy->features |= get_features(argc, argv, &error); - if (error) { - return error; - } - sway_log(L_DEBUG, "Permissions granted to %s for features %d", policy->program, policy->features); @@ -87,19 +80,13 @@ struct cmd_results *cmd_reject(int argc, char **argv) { if ((error = checkarg(argc, "reject", EXPECTED_MORE_THAN, 1))) { return error; } - - if (!current_config_path || strcmp(SYSCONFDIR "/sway/security", current_config_path) != 0) { - return cmd_results_new(CMD_INVALID, "permit", - "This command is only permitted to run from " SYSCONFDIR "/sway/security"); + if ((error = check_security_config())) { + return error; } struct feature_policy *policy = get_policy(argv[0]); policy->features &= ~get_features(argc, argv, &error); - if (error) { - return error; - } - sway_log(L_DEBUG, "Permissions granted to %s for features %d", policy->program, policy->features); |