pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/script: require ‘path’ to be an absolute path

Browse source
This commit is contained in:
Daniel Eklöf 2020-10-30 11:53:25 +01:00
parent 5c9030129d
commit 2bb70c6fcb
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/script.c
View file

@ -492,7 +492,7 @@ script_new(const char *path, size_t argc, const char *const argv[static argc],
static struct module *
from_conf(const struct yml_node *node, struct conf_inherit inherited)
{
const struct yml_node *run = yml_get_value(node, "path");
const struct yml_node *path = yml_get_value(node, "path");
const struct yml_node *args = yml_get_value(node, "args");
const struct yml_node *c = yml_get_value(node, "content");
@ -510,7 +510,22 @@ from_conf(const struct yml_node *node, struct conf_inherit inherited)
}
return script_new(
yml_value_as_string(run), argc, argv, conf_to_particle(c, inherited));
yml_value_as_string(path), argc, argv, conf_to_particle(c, inherited));
}
static bool
conf_verify_path(keychain_t *chain, const struct yml_node *node)
{
if (!conf_verify_string(chain, node))
return false;
const char *path = yml_value_as_string(node);
if (strlen(path) < 1 || path[0] != '/') {
LOG_ERR("%s: path must be absolute", conf_err_prefix(chain, node));
return false;
}
return true;
}
static bool
@ -523,7 +538,7 @@ static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
{"path", true, &conf_verify_string},
{"path", true, &conf_verify_path},
{"args", false, &conf_verify_args},
MODULE_COMMON_ATTRS,
};