1 files changed, 36 insertions, 3 deletions

diff --git a/sway/commands/permit.c b/sway/commands/permit.c
index c55f46d8..66fa4e2a 100644
--- a/sway/commands/permit.c
+++ b/sway/commands/permit.c
@@ -1,7 +1,9 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/security.h"
+#include "util.h"
 #include "log.h"
 
 static enum secure_feature get_features(int argc, char **argv,
@@ -47,12 +49,29 @@ struct cmd_results *cmd_permit(int argc, char **argv) {
                 return error;
         }
 
-        struct feature_policy *policy = get_feature_policy(argv[0]);
-        policy->features |= get_features(argc, argv, &error);
+        bool assign_perms = true;
+        char *program = NULL;
 
+        if (!strcmp(argv[0], "*")) {
+                program = strdup(argv[0]);
+        } else {
+                program = resolve_path(argv[0]);
+        }
+        if (!program) {
+                sway_assert(program, "Unable to resolve IPC permit target '%s'."
+                        " will issue empty policy", argv[0]);
+                assign_perms = false;
+                program = strdup(argv[0]);
+        }
+
+        struct feature_policy *policy = get_feature_policy(program);
+        if (assign_perms) {
+                policy->features |= get_features(argc, argv, &error);
+        }
         sway_log(L_DEBUG, "Permissions granted to %s for features %d",
                         policy->program, policy->features);
 
+        free(program);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
@@ -65,11 +84,25 @@ struct cmd_results *cmd_reject(int argc, char **argv) {
                 return error;
         }
 
-        struct feature_policy *policy = get_feature_policy(argv[0]);
+        char *program = NULL;
+        if (!strcmp(argv[0], "*")) {
+                program = strdup(argv[0]);
+        } else {
+                program = resolve_path(argv[0]);
+        }
+        if (!program) {
+                // Punt
+                sway_log(L_INFO, "Unable to resolve IPC reject target '%s'."
+                        " Will use provided path", argv[0]);
+                program = strdup(argv[0]);
+        }
+
+        struct feature_policy *policy = get_feature_policy(program);
         policy->features &= ~get_features(argc, argv, &error);
 
         sway_log(L_DEBUG, "Permissions granted to %s for features %d",
                         policy->program, policy->features);
 
+        free(program);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }