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

Load up security.d/* on startup

Browse source
This commit is contained in:
Drew DeVault 2018-08-01 21:33:47 -04:00
parent 14f89600a8
commit bce7068b65
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/config.h
View file

@ -461,6 +461,8 @@ void free_sway_variable(struct sway_variable *var);
*/ */
char *do_var_replacement(char *str); char *do_var_replacement(char *str);
struct cmd_results *check_security_config(struct sway_config *config);
int input_identifier_cmp(const void *item, const void *data); int input_identifier_cmp(const void *item, const void *data);
struct input_config *new_input_config(const char* identifier); struct input_config *new_input_config(const char* identifier);

18
sway/config.c
View file

@ -377,6 +377,10 @@ static bool load_config(const char *path, struct sway_config *config,
return true; return true;
} }
static int qstrcmp(const void* a, const void* b) {
return strcmp(*((char**) a), *((char**) b));
}
bool load_main_config(const char *file, bool is_active, bool validating) { bool load_main_config(const char *file, bool is_active, bool validating) {
char *path; char *path;
if (file != NULL) { if (file != NULL) {
@ -412,9 +416,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
config->reading = true; config->reading = true;
// Read security configs // Read security configs
// TODO: Security
bool success = true; bool success = true;
/*
DIR *dir = opendir(SYSCONFDIR "/sway/security.d"); DIR *dir = opendir(SYSCONFDIR "/sway/security.d");
if (!dir) { if (!dir) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
@ -457,7 +459,6 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
free_flat_list(secconfigs); free_flat_list(secconfigs);
} }
*/
success = success && load_config(path, config, success = success && load_config(path, config,
&config->swaynag_config_errors); &config->swaynag_config_errors);
@ -486,6 +487,17 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
return success; return success;
} }
struct cmd_results *check_security_config(struct sway_config *config) {
const char *path = SYSCONFDIR "/sway/security.d/";
if (!config->current_config_path ||
strncmp(path, config->current_config_path, strlen(path)) != 0) {
return cmd_results_new(CMD_INVALID, "permit",
"This command is only permitted to run from %s/sway/security.d/*",
path);
}
return NULL;
}
static bool load_include_config(const char *path, const char *parent_dir, static bool load_include_config(const char *path, const char *parent_dir,
struct sway_config *config, struct swaynag_instance *swaynag) { struct sway_config *config, struct swaynag_instance *swaynag) {
// save parent config // save parent config