mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-22 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add security context properties to criteria

Browse source
This commit is contained in:
Puck Meerburg 2022-08-07 10:12:51 +00:00
parent e892c605a2
commit 3611d1e245
3 changed files with 70 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/criteria.h
View file

@ -48,6 +48,8 @@ struct criteria {
char urgent; // 'l' for latest or 'o' for oldest
struct pattern *workspace;
pid_t pid;
struct pattern *sandbox_app_id;
struct pattern *sandbox_engine;
};
bool criteria_is_empty(struct criteria *criteria);

58
sway/criteria.c
View file

@ -33,7 +33,9 @@ bool criteria_is_empty(struct criteria *criteria) {
&& !criteria->tiling
&& !criteria->urgent
&& !criteria->workspace
&& !criteria->pid;
&& !criteria->pid
&& !criteria->sandbox_app_id
&& !criteria->sandbox_engine;
}
// The error pointer is used for parsing functions, and saves having to pass it
@ -96,6 +98,8 @@ void criteria_destroy(struct criteria *criteria) {
pattern_destroy(criteria->window_role);
#endif
pattern_destroy(criteria->con_mark);
pattern_destroy(criteria->sandbox_app_id);
pattern_destroy(criteria->sandbox_engine);
free(criteria->workspace);
free(criteria->cmdlist);
free(criteria->raw);
@ -246,6 +250,46 @@ static bool criteria_matches_view(struct criteria *criteria,
}
}
if (criteria->sandbox_app_id) {
const char *sandbox_app_id = view_get_sandbox_app_id(view);
if (!sandbox_app_id) {
return false;
}
switch (criteria->sandbox_app_id->match_type) {
case PATTERN_FOCUSED:
if (focused && lenient_strcmp(sandbox_app_id, view_get_sandbox_app_id(focused))) {
return false;
}
break;
case PATTERN_PCRE2:
if (regex_cmp(sandbox_app_id, criteria->sandbox_app_id->regex) < 0) {
return false;
}
break;
}
}
if (criteria->sandbox_engine) {
const char *sandbox_engine = view_get_sandbox_engine(view);
if (!sandbox_engine) {
return false;
}
switch (criteria->sandbox_engine->match_type) {
case PATTERN_FOCUSED:
if (focused && lenient_strcmp(sandbox_engine, view_get_sandbox_engine(focused))) {
return false;
}
break;
case PATTERN_PCRE2:
if (regex_cmp(sandbox_engine, criteria->sandbox_engine->regex) < 0) {
return false;
}
break;
}
}
if (!criteria_matches_container(criteria, view->container)) {
return false;
}
@ -472,6 +516,8 @@ enum criteria_token {
T_URGENT,
T_WORKSPACE,
T_PID,
T_SANDBOX_APP_ID,
T_SANDBOX_ENGINE,
T_INVALID,
};
@ -509,6 +555,10 @@ static enum criteria_token token_from_name(char *name) {
return T_FLOATING;
} else if (strcmp(name, "pid") == 0) {
return T_PID;
} else if (strcmp(name, "sandbox_app_id") == 0) {
return T_SANDBOX_APP_ID;
} else if (strcmp(name, "sandbox_engine") == 0) {
return T_SANDBOX_ENGINE;
}
return T_INVALID;
}
@ -609,6 +659,12 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
error = strdup("The value for 'pid' should be numeric");
}
break;
case T_SANDBOX_APP_ID:
pattern_create(&criteria->sandbox_app_id, value);
break;
case T_SANDBOX_ENGINE:
pattern_create(&criteria->sandbox_engine, value);
break;
case T_INVALID:
break;
}

11
sway/sway.5.scd
View file

@ -1026,6 +1026,17 @@ The following attributes may be matched with:
expression. If the value is \_\_focused\_\_, then all the views on the
currently focused workspace matches.
*sandbox_app_id*
Compare against the sandboxed app id for this view. Can be a regular
expression. If the value is \_\_focused\_\_, then the sandboxed app id must
be the same as that of the currently focused window.
*sandbox_engine*
Compare against the sandbox engine for this view. Can be a regular
expression. If the value is \_\_focused\_\_, then the sandbox engine must be
the same as that of the currently focused window.
# SEE ALSO
*sway*(1) *sway-input*(5) *sway-output*(5) *sway-bar*(5) *sway-ipc*(7)