SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: rework unit name validation and manipulation logic

Browse Source 
A variety of changes:

- Make sure all our calls distuingish OOM from other errors if OOM is
  not the only error possible.

- Be much stricter when parsing escaped paths, do not accept trailing or
  leading escaped slashes.

- Change unit validation to take a bit mask for allowing plain names,
  instance names or template names or an combination thereof.

- Refuse manipulating invalid unit name
This commit is contained in:
Lennart Poettering
2015-05-05 15:06:42 -07:00
parent 6442185ab6
commit 7410616cd9
34 changed files with 1066 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/unit-printf.c
+13 -42
View File
@@ -30,83 +30,54 @@
static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
char *n;
assert(u);
n = unit_name_to_prefix_and_instance(u->id);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_to_prefix_and_instance(u->id, ret);
}
static int specifier_prefix(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
char *n;
assert(u);
n = unit_name_to_prefix(u->id);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_to_prefix(u->id, ret);
}
static int specifier_prefix_unescaped(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
_cleanup_free_ char *p = NULL;
char *n;
Unit *u = userdata;
int r;
assert(u);
p = unit_name_to_prefix(u->id);
if (!p)
return -ENOMEM;
r = unit_name_to_prefix(u->id, &p);
if (r < 0)
return r;
n = unit_name_unescape(p);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_unescape(p, ret);
}
static int specifier_instance_unescaped(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
char *n;
assert(u);
if (!u->instance)
return -EOPNOTSUPP;
return -EINVAL;
n = unit_name_unescape(u->instance);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_unescape(u->instance, ret);
}
static int specifier_filename(char specifier, void *data, void *userdata, char **ret) {
Unit *u = userdata;
char *n;
assert(u);
if (u->instance)
n = unit_name_path_unescape(u->instance);
return unit_name_path_unescape(u->instance, ret);
else
n = unit_name_to_path(u->id);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_to_path(u->id, ret);
}
static int specifier_cgroup(char specifier, void *data, void *userdata, char **ret) {
@@ -195,7 +166,7 @@ static int specifier_user_name(char specifier, void *data, void *userdata, char
c = unit_get_exec_context(u);
if (!c)
return -EOPNOTSUPP;
return -EINVAL;
if (u->manager->running_as == SYSTEMD_SYSTEM) {