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/shared/cgroup-util.c
+8 -7
View File
@@ -1154,7 +1154,7 @@ int cg_path_decode_unit(const char *cgroup, char **unit){
c = strndupa(cgroup, n);
c = cg_unescape(c);
if (!unit_name_is_valid(c, TEMPLATE_INVALID))
if (!unit_name_is_valid(c, UNIT_NAME_PLAIN|UNIT_NAME_INSTANCE))
return -ENXIO;
s = strdup(c);
@@ -1181,7 +1181,7 @@ static bool valid_slice_name(const char *p, size_t n) {
c = cg_unescape(buf);
return unit_name_is_valid(c, TEMPLATE_INVALID);
return unit_name_is_valid(c, UNIT_NAME_PLAIN);
}
return false;
@@ -1638,6 +1638,7 @@ bool cg_controller_is_valid(const char *p, bool allow_named) {
int cg_slice_to_path(const char *unit, char **ret) {
_cleanup_free_ char *p = NULL, *s = NULL, *e = NULL;
const char *dash;
int r;
assert(unit);
assert(ret);
@@ -1652,15 +1653,15 @@ int cg_slice_to_path(const char *unit, char **ret) {
return 0;
}
if (!unit_name_is_valid(unit, TEMPLATE_INVALID))
if (!unit_name_is_valid(unit, UNIT_NAME_PLAIN))
return -EINVAL;
if (!endswith(unit, ".slice"))
return -EINVAL;
p = unit_name_to_prefix(unit);
if (!p)
return -ENOMEM;
r = unit_name_to_prefix(unit, &p);
if (r < 0)
return r;
dash = strchr(p, '-');
@@ -1677,7 +1678,7 @@ int cg_slice_to_path(const char *unit, char **ret) {
return -EINVAL;
strcpy(stpncpy(n, p, dash - p), ".slice");
if (!unit_name_is_valid(n, TEMPLATE_INVALID))
if (!unit_name_is_valid(n, UNIT_NAME_PLAIN))
return -EINVAL;
escaped = cg_escape(n);
src/shared/dropin.c
+8 -7
View File
@@ -164,7 +164,7 @@ static int iterate_dir(
}
int unit_file_process_dir(
Set * unit_path_cache,
Set *unit_path_cache,
const char *unit_path,
const char *name,
const char *suffix,
@@ -174,6 +174,7 @@ int unit_file_process_dir(
char ***strv) {
_cleanup_free_ char *path = NULL;
int r;
assert(unit_path);
assert(name);
@@ -184,22 +185,22 @@ int unit_file_process_dir(
return log_oom();
if (!unit_path_cache || set_get(unit_path_cache, path))
iterate_dir(path, dependency, consumer, arg, strv);
(void) iterate_dir(path, dependency, consumer, arg, strv);
if (unit_name_is_instance(name)) {
if (unit_name_is_valid(name, UNIT_NAME_INSTANCE)) {
_cleanup_free_ char *template = NULL, *p = NULL;
/* Also try the template dir */
template = unit_name_template(name);
if (!template)
return log_oom();
r = unit_name_template(name, &template);
if (r < 0)
return log_error_errno(r, "Failed to generate template from unit name: %m");
p = strjoin(unit_path, "/", template, suffix, NULL);
if (!p)
return log_oom();
if (!unit_path_cache || set_get(unit_path_cache, p))
iterate_dir(p, dependency, consumer, arg, strv);
(void) iterate_dir(p, dependency, consumer, arg, strv);
}
return 0;
src/shared/generator.c
+9 -9
View File
@@ -37,6 +37,8 @@ int generator_write_fsck_deps(
const char *where,
const char *fstype) {
int r;
assert(f);
assert(dir);
assert(what);
@@ -48,7 +50,6 @@ int generator_write_fsck_deps(
}
if (!isempty(fstype) && !streq(fstype, "auto")) {
int r;
r = fsck_exists(fstype);
if (r == -ENOENT) {
/* treat missing check as essentially OK */
@@ -70,9 +71,9 @@ int generator_write_fsck_deps(
} else {
_cleanup_free_ char *fsck = NULL;
fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
if (!fsck)
return log_oom();
r = unit_name_from_path_instance("systemd-fsck", what, ".service", &fsck);
if (r < 0)
return log_error_errno(r, "Failed to create fsck service name: %m");
fprintf(f,
"RequiresOverridable=%1$s\n"
@@ -106,8 +107,7 @@ int generator_write_timeouts(
r = parse_sec(timeout, &u);
if (r < 0) {
log_warning("Failed to parse timeout for %s, ignoring: %s",
where, timeout);
log_warning("Failed to parse timeout for %s, ignoring: %s", where, timeout);
return 0;
}
@@ -115,9 +115,9 @@ int generator_write_timeouts(
if (!node)
return log_oom();
unit = unit_name_from_path(node, ".device");
if (!unit)
return log_oom();
r = unit_name_from_path(node, ".device", &unit);
if (r < 0)
return log_error_errno(r, "Failed to make unit name from path: %m");
return write_drop_in_format(dir, unit, 50, "device-timeout",
"# Automatically generated by %s\n\n"
src/shared/install-printf.c
+2 -14
View File
@@ -29,30 +29,18 @@
static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
InstallInfo *i = userdata;
char *n;
assert(i);
n = unit_name_to_prefix_and_instance(i->name);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_to_prefix_and_instance(i->name, ret);
}
static int specifier_prefix(char specifier, void *data, void *userdata, char **ret) {
InstallInfo *i = userdata;
char *n;
assert(i);
n = unit_name_to_prefix(i->name);
if (!n)
return -ENOMEM;
*ret = n;
return 0;
return unit_name_to_prefix(i->name, ret);
}
static int specifier_instance(char specifier, void *data, void *userdata, char **ret) {
src/shared/install.c
+29 -30
View File
@@ -258,10 +258,10 @@ static int remove_marked_symlinks_fd(
int q;
bool found;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY))
continue;
if (unit_name_is_instance(de->d_name) &&
if (unit_name_is_valid(de->d_name, UNIT_NAME_INSTANCE) &&
instance_whitelist &&
!strv_contains(instance_whitelist, de->d_name)) {
@@ -272,9 +272,9 @@ static int remove_marked_symlinks_fd(
* the template of it might be
* listed. */
w = unit_name_template(de->d_name);
if (!w)
return -ENOMEM;
r = unit_name_template(de->d_name, &w);
if (r < 0)
return r;
if (!strv_contains(instance_whitelist, w))
continue;
@@ -583,7 +583,7 @@ int unit_file_mask(
STRV_FOREACH(i, files) {
_cleanup_free_ char *path = NULL;
if (!unit_name_is_valid(*i, TEMPLATE_VALID)) {
if (!unit_name_is_valid(*i, UNIT_NAME_ANY)) {
if (r == 0)
r = -EINVAL;
continue;
@@ -646,7 +646,7 @@ int unit_file_unmask(
STRV_FOREACH(i, files) {
_cleanup_free_ char *path = NULL;
if (!unit_name_is_valid(*i, TEMPLATE_VALID)) {
if (!unit_name_is_valid(*i, UNIT_NAME_ANY)) {
if (r == 0)
r = -EINVAL;
continue;
@@ -717,7 +717,7 @@ int unit_file_link(
fn = basename(*i);
if (!path_is_absolute(*i) ||
!unit_name_is_valid(fn, TEMPLATE_VALID)) {
!unit_name_is_valid(fn, UNIT_NAME_ANY)) {
if (r == 0)
r = -EINVAL;
continue;
@@ -856,7 +856,7 @@ static int install_info_add(
if (!name)
name = basename(path);
if (!unit_name_is_valid(name, TEMPLATE_VALID))
if (!unit_name_is_valid(name, UNIT_NAME_ANY))
return -EINVAL;
if (ordered_hashmap_get(c->have_installed, name) ||
@@ -1118,7 +1118,7 @@ static int unit_file_search(
return r;
}
if (unit_name_is_instance(info->name)) {
if (unit_name_is_valid(info->name, UNIT_NAME_INSTANCE)) {
/* Unit file doesn't exist, however instance
* enablement was requested. We will check if it is
@@ -1126,9 +1126,9 @@ static int unit_file_search(
_cleanup_free_ char *template = NULL;
template = unit_name_template(info->name);
if (!template)
return -ENOMEM;
r = unit_name_template(info->name, &template);
if (r < 0)
return r;
STRV_FOREACH(p, paths->unit_path) {
_cleanup_free_ char *path = NULL;
@@ -1274,7 +1274,7 @@ static int install_info_symlink_wants(
assert(i);
assert(config_path);
if (unit_name_is_template(i->name)) {
if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE)) {
/* Don't install any symlink if there's no default
* instance configured */
@@ -1282,9 +1282,9 @@ static int install_info_symlink_wants(
if (!i->default_instance)
return 0;
buf = unit_name_replace_instance(i->name, i->default_instance);
if (!buf)
return -ENOMEM;
r = unit_name_replace_instance(i->name, i->default_instance, &buf);
if (r < 0)
return r;
n = buf;
} else
@@ -1297,7 +1297,7 @@ static int install_info_symlink_wants(
if (q < 0)
return q;
if (!unit_name_is_valid(dst, TEMPLATE_VALID)) {
if (!unit_name_is_valid(dst, UNIT_NAME_ANY)) {
r = -EINVAL;
continue;
}
@@ -1462,13 +1462,13 @@ static int install_context_mark_for_removal(
} else if (r >= 0)
r += q;
if (unit_name_is_instance(i->name)) {
if (unit_name_is_valid(i->name, UNIT_NAME_INSTANCE)) {
char *unit_file;
if (i->path) {
unit_file = basename(i->path);
if (unit_name_is_instance(unit_file))
if (unit_name_is_valid(unit_file, UNIT_NAME_INSTANCE))
/* unit file named as instance exists, thus all symlinks
* pointing to it will be removed */
q = mark_symlink_for_removal(remove_symlinks_to, i->name);
@@ -1480,9 +1480,9 @@ static int install_context_mark_for_removal(
/* If i->path is not set, it means that we didn't actually find
* the unit file. But we can still remove symlinks to the
* nonexistent template. */
unit_file = unit_name_template(i->name);
if (!unit_file)
return log_oom();
r = unit_name_template(i->name, &unit_file);
if (r < 0)
return r;
q = mark_symlink_for_removal(remove_symlinks_to, unit_file);
free(unit_file);
@@ -1797,7 +1797,7 @@ UnitFileState unit_file_lookup_state(
assert(paths);
if (!unit_name_is_valid(name, TEMPLATE_VALID))
if (!unit_name_is_valid(name, UNIT_NAME_ANY))
return -EINVAL;
STRV_FOREACH(i, paths->unit_path) {
@@ -1824,7 +1824,7 @@ UnitFileState unit_file_lookup_state(
if (errno != ENOENT)
return r;
if (!unit_name_is_instance(name))
if (!unit_name_is_valid(name, UNIT_NAME_INSTANCE))
continue;
} else {
if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
@@ -1834,8 +1834,7 @@ UnitFileState unit_file_lookup_state(
if (r < 0 && r != -ENOENT)
return r;
else if (r > 0) {
state = path_startswith(*i, "/run") ?
UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
state = path_startswith(*i, "/run") ? UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
return state;
}
}
@@ -1995,7 +1994,7 @@ int unit_file_preset(
STRV_FOREACH(i, files) {
if (!unit_name_is_valid(*i, TEMPLATE_VALID))
if (!unit_name_is_valid(*i, UNIT_NAME_ANY))
return -EINVAL;
r = unit_file_query_preset(scope, root_dir, *i);
@@ -2091,7 +2090,7 @@ int unit_file_preset_all(
if (hidden_file(de->d_name))
continue;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY))
continue;
dirent_ensure_type(d, de);
@@ -2203,7 +2202,7 @@ int unit_file_get_list(
if (hidden_file(de->d_name))
continue;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY))
continue;
if (hashmap_get(h, de->d_name))
src/shared/unit-name.c
+395 -241
View File
@@ -33,45 +33,13 @@
DIGITS LETTERS \
":-_.\\"
static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "service",
[UNIT_SOCKET] = "socket",
[UNIT_BUSNAME] = "busname",
[UNIT_TARGET] = "target",
[UNIT_SNAPSHOT] = "snapshot",
[UNIT_DEVICE] = "device",
[UNIT_MOUNT] = "mount",
[UNIT_AUTOMOUNT] = "automount",
[UNIT_SWAP] = "swap",
[UNIT_TIMER] = "timer",
[UNIT_PATH] = "path",
[UNIT_SLICE] = "slice",
[UNIT_SCOPE] = "scope"
};
DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
[UNIT_STUB] = "stub",
[UNIT_LOADED] = "loaded",
[UNIT_NOT_FOUND] = "not-found",
[UNIT_ERROR] = "error",
[UNIT_MERGED] = "merged",
[UNIT_MASKED] = "masked"
};
DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState);
bool unit_name_is_valid(const char *n, enum template_valid template_ok) {
bool unit_name_is_valid(const char *n, UnitNameFlags flags) {
const char *e, *i, *at;
/* Valid formats:
*
* string@instance.suffix
* string.suffix
*/
assert((flags & ~(UNIT_NAME_PLAIN|UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE)) == 0);
assert(IN_SET(template_ok, TEMPLATE_VALID, TEMPLATE_INVALID));
if (_unlikely_(flags == 0))
return false;
if (isempty(n))
return false;
@@ -95,15 +63,32 @@ bool unit_name_is_valid(const char *n, enum template_valid template_ok) {
return false;
}
if (at) {
if (at == n)
return false;
if (at == n)
return false;
if (template_ok != TEMPLATE_VALID && at+1 == e)
return false;
}
if (flags & UNIT_NAME_PLAIN)
if (!at)
return true;
return true;
if (flags & UNIT_NAME_INSTANCE)
if (at && e > at + 1)
return true;
if (flags & UNIT_NAME_TEMPLATE)
if (at && e == at + 1)
return true;
return false;
}
bool unit_prefix_is_valid(const char *p) {
/* We don't allow additional @ in the prefix string */
if (isempty(p))
return false;
return in_charset(p, VALID_CHARS);
}
bool unit_instance_is_valid(const char *i) {
@@ -120,14 +105,41 @@ bool unit_instance_is_valid(const char *i) {
return in_charset(i, "@" VALID_CHARS);
}
bool unit_prefix_is_valid(const char *p) {
/* We don't allow additional @ in the instance string */
if (isempty(p))
bool unit_suffix_is_valid(const char *s) {
if (isempty(s))
return false;
return in_charset(p, VALID_CHARS);
if (s[0] != '.')
return false;
if (unit_type_from_string(s + 1) < 0)
return false;
return true;
}
int unit_name_to_prefix(const char *n, char **ret) {
const char *p;
char *s;
assert(n);
assert(ret);
if (!unit_name_is_valid(n, UNIT_NAME_ANY))
return -EINVAL;
p = strchr(n, '@');
if (!p)
p = strrchr(n, '.');
assert_se(p);
s = strndup(n, p - n);
if (!s)
return -ENOMEM;
*ret = s;
return 0;
}
int unit_name_to_instance(const char *n, char **instance) {
@@ -137,6 +149,9 @@ int unit_name_to_instance(const char *n, char **instance) {
assert(n);
assert(instance);
if (!unit_name_is_valid(n, UNIT_NAME_ANY))
return -EINVAL;
/* Everything past the first @ and before the last . is the instance */
p = strchr(n, '@');
if (!p) {
@@ -144,13 +159,13 @@ int unit_name_to_instance(const char *n, char **instance) {
return 0;
}
d = strrchr(n, '.');
p++;
d = strrchr(p, '.');
if (!d)
return -EINVAL;
if (d < p)
return -EINVAL;
i = strndup(p+1, d-p-1);
i = strndup(p, d-p);
if (!i)
return -ENOMEM;
@@ -158,55 +173,95 @@ int unit_name_to_instance(const char *n, char **instance) {
return 1;
}
char *unit_name_to_prefix_and_instance(const char *n) {
int unit_name_to_prefix_and_instance(const char *n, char **ret) {
const char *d;
char *s;
assert(n);
assert(ret);
if (!unit_name_is_valid(n, UNIT_NAME_ANY))
return -EINVAL;
d = strrchr(n, '.');
if (!d)
return -EINVAL;
s = strndup(n, d - n);
if (!s)
return -ENOMEM;
*ret = s;
return 0;
}
UnitType unit_name_to_type(const char *n) {
const char *e;
assert(n);
assert_se(d = strrchr(n, '.'));
return strndup(n, d - n);
if (!unit_name_is_valid(n, UNIT_NAME_ANY))
return _UNIT_TYPE_INVALID;
assert_se(e = strrchr(n, '.'));
return unit_type_from_string(e + 1);
}
char *unit_name_to_prefix(const char *n) {
const char *p;
assert(n);
p = strchr(n, '@');
if (p)
return strndup(n, p - n);
return unit_name_to_prefix_and_instance(n);
}
char *unit_name_change_suffix(const char *n, const char *suffix) {
char *e, *r;
int unit_name_change_suffix(const char *n, const char *suffix, char **ret) {
char *e, *s;
size_t a, b;
assert(n);
assert(suffix);
assert(suffix[0] == '.');
assert(ret);
if (!unit_name_is_valid(n, UNIT_NAME_ANY))
return -EINVAL;
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
assert_se(e = strrchr(n, '.'));
a = e - n;
b = strlen(suffix);
r = new(char, a + b + 1);
if (!r)
return NULL;
s = new(char, a + b + 1);
if (!s)
return -ENOMEM;
strcpy(mempcpy(r, n, a), suffix);
return r;
strcpy(mempcpy(s, n, a), suffix);
*ret = s;
return 0;
}
char *unit_name_build(const char *prefix, const char *instance, const char *suffix) {
int unit_name_build(const char *prefix, const char *instance, const char *suffix, char **ret) {
char *s;
assert(prefix);
assert(suffix);
assert(ret);
if (!unit_prefix_is_valid(prefix))
return -EINVAL;
if (instance && !unit_instance_is_valid(instance))
return -EINVAL;
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
if (!instance)
return strappend(prefix, suffix);
s = strappend(prefix, suffix);
else
s = strjoin(prefix, "@", instance, suffix, NULL);
if (!s)
return -ENOMEM;
return strjoin(prefix, "@", instance, suffix, NULL);
*ret = s;
return 0;
}
static char *do_escape_char(char c, char *t) {
@@ -242,30 +297,6 @@ static char *do_escape(const char *f, char *t) {
return t;
}
static char *do_escape_mangle(const char *f, enum unit_name_mangle allow_globs, char *t) {
const char *valid_chars;
assert(f);
assert(IN_SET(allow_globs, MANGLE_GLOB, MANGLE_NOGLOB));
assert(t);
/* We'll only escape the obvious characters here, to play
* safe. */
valid_chars = allow_globs == MANGLE_GLOB ? "@" VALID_CHARS "[]!-*?" : "@" VALID_CHARS;
for (; *f; f++) {
if (*f == '/')
*(t++) = '-';
else if (!strchr(valid_chars, *f))
t = do_escape_char(*f, t);
else
*(t++) = *f;
}
return t;
}
char *unit_name_escape(const char *f) {
char *r, *t;
@@ -281,14 +312,15 @@ char *unit_name_escape(const char *f) {
return r;
}
char *unit_name_unescape(const char *f) {
char *r, *t;
int unit_name_unescape(const char *f, char **ret) {
_cleanup_free_ char *r = NULL;
char *t;
assert(f);
r = strdup(f);
if (!r)
return NULL;
return -ENOMEM;
for (t = r; *f; f++) {
if (*f == '-')
@@ -296,180 +328,228 @@ char *unit_name_unescape(const char *f) {
else if (*f == '\\') {
int a, b;
if (f[1] != 'x' ||
(a = unhexchar(f[2])) < 0 ||
(b = unhexchar(f[3])) < 0) {
/* Invalid escape code, let's take it literal then */
*(t++) = '\\';
} else {
*(t++) = (char) ((a << 4) | b);
f += 3;
}
if (f[1] != 'x')
return -EINVAL;
a = unhexchar(f[2]);
if (a < 0)
return -EINVAL;
b = unhexchar(f[3]);
if (b < 0)
return -EINVAL;
*(t++) = (char) ((a << 4) | b);
f += 3;
} else
*(t++) = *f;
}
*t = 0;
return r;
*ret = r;
r = NULL;
return 0;
}
char *unit_name_path_escape(const char *f) {
_cleanup_free_ char *p = NULL;
int unit_name_path_escape(const char *f, char **ret) {
char *p, *s;
assert(f);
assert(ret);
p = strdup(f);
p = strdupa(f);
if (!p)
return NULL;
return -ENOMEM;
path_kill_slashes(p);
if (STR_IN_SET(p, "/", ""))
return strdup("-");
s = strdup("-");
else {
char *e;
return unit_name_escape(p[0] == '/' ? p + 1 : p);
if (!path_is_safe(p))
return -EINVAL;
/* Truncate trailing slashes */
e = endswith(p, "/");
if (e)
*e = 0;
/* Truncate leading slashes */
if (p[0] == '/')
p++;
s = unit_name_escape(p);
}
if (!s)
return -ENOMEM;
*ret = s;
return 0;
}
char *unit_name_path_unescape(const char *f) {
char *e, *w;
int unit_name_path_unescape(const char *f, char **ret) {
char *s, *w;
int r;
assert(f);
e = unit_name_unescape(f);
if (!e)
return NULL;
if (streq(f, "-")) {
s = strdup("/");
if (!s)
return -ENOMEM;
if (e[0] != '/') {
w = strappend("/", e);
free(e);
return w;
*ret = s;
return 0;
}
return e;
r = unit_name_unescape(f, &s);
if (r < 0)
return r;
/* Don't accept trailing or leading slashes */
if (startswith(s, "/") || endswith(s, "/")) {
free(s);
return -EINVAL;
}
/* Prefix a slash again */
w = strappend("/", s);
free(s);
if (!w)
return -ENOMEM;
if (!path_is_safe(w)) {
free(w);
return -EINVAL;
}
*ret = w;
return 0;
}
bool unit_name_is_template(const char *n) {
int unit_name_replace_instance(const char *f, const char *i, char **ret) {
const char *p, *e;
assert(n);
p = strchr(n, '@');
if (!p)
return false;
e = strrchr(p+1, '.');
if (!e)
return false;
return e == p + 1;
}
bool unit_name_is_instance(const char *n) {
const char *p, *e;
assert(n);
p = strchr(n, '@');
if (!p)
return false;
e = strrchr(p+1, '.');
if (!e)
return false;
return e > p + 1;
}
char *unit_name_replace_instance(const char *f, const char *i) {
const char *p, *e;
char *r;
char *s;
size_t a, b;
assert(f);
assert(i);
assert(ret);
p = strchr(f, '@');
if (!p)
return strdup(f);
if (!unit_name_is_valid(f, UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE))
return -EINVAL;
if (!unit_instance_is_valid(i))
return -EINVAL;
e = strrchr(f, '.');
if (!e)
e = strchr(f, 0);
assert_se(p = strchr(f, '@'));
assert_se(e = strrchr(f, '.'));
a = p - f;
b = strlen(i);
r = new(char, a + 1 + b + strlen(e) + 1);
if (!r)
return NULL;
s = new(char, a + 1 + b + strlen(e) + 1);
if (!s)
return -ENOMEM;
strcpy(mempcpy(mempcpy(r, f, a + 1), i, b), e);
return r;
strcpy(mempcpy(mempcpy(s, f, a + 1), i, b), e);
*ret = s;
return 0;
}
char *unit_name_template(const char *f) {
int unit_name_template(const char *f, char **ret) {
const char *p, *e;
char *r;
char *s;
size_t a;
assert(f);
assert(ret);
p = strchr(f, '@');
if (!p)
return strdup(f);
if (!unit_name_is_valid(f, UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE))
return -EINVAL;
e = strrchr(f, '.');
if (!e)
e = strchr(f, 0);
assert_se(p = strchr(f, '@'));
assert_se(e = strrchr(f, '.'));
a = p - f;
r = new(char, a + 1 + strlen(e) + 1);
if (!r)
return NULL;
s = new(char, a + 1 + strlen(e) + 1);
if (!s)
return -ENOMEM;
strcpy(mempcpy(r, f, a + 1), e);
return r;
strcpy(mempcpy(s, f, a + 1), e);
*ret = s;
return 0;
}
char *unit_name_from_path(const char *path, const char *suffix) {
int unit_name_from_path(const char *path, const char *suffix, char **ret) {
_cleanup_free_ char *p = NULL;
char *s = NULL;
int r;
assert(path);
assert(suffix);
assert(ret);
p = unit_name_path_escape(path);
if (!p)
return NULL;
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
return strappend(p, suffix);
r = unit_name_path_escape(path, &p);
if (r < 0)
return r;
s = strappend(p, suffix);
if (!s)
return -ENOMEM;
*ret = s;
return 0;
}
char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix) {
int unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix, char **ret) {
_cleanup_free_ char *p = NULL;
char *s;
int r;
assert(prefix);
assert(path);
assert(suffix);
assert(ret);
p = unit_name_path_escape(path);
if (!p)
return NULL;
if (!unit_prefix_is_valid(prefix))
return -EINVAL;
return strjoin(prefix, "@", p, suffix, NULL);
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
r = unit_name_path_escape(path, &p);
if (r < 0)
return r;
s = strjoin(prefix, "@", p, suffix, NULL);
if (!s)
return -ENOMEM;
*ret = s;
return 0;
}
char *unit_name_to_path(const char *name) {
_cleanup_free_ char *w = NULL;
int unit_name_to_path(const char *name, char **ret) {
_cleanup_free_ char *prefix = NULL;
int r;
assert(name);
w = unit_name_to_prefix(name);
if (!w)
return NULL;
r = unit_name_to_prefix(name, &prefix);
if (r < 0)
return r;
return unit_name_path_unescape(w);
return unit_name_path_unescape(prefix, ret);
}
char *unit_dbus_path_from_name(const char *name) {
@@ -500,6 +580,30 @@ int unit_name_from_dbus_path(const char *path, char **name) {
return 0;
}
static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t) {
const char *valid_chars;
assert(f);
assert(IN_SET(allow_globs, UNIT_NAME_GLOB, UNIT_NAME_NOGLOB));
assert(t);
/* We'll only escape the obvious characters here, to play
* safe. */
valid_chars = allow_globs == UNIT_NAME_GLOB ? "@" VALID_CHARS "[]!-*?" : "@" VALID_CHARS;
for (; *f; f++) {
if (*f == '/')
*(t++) = '-';
else if (!strchr(valid_chars, *f))
t = do_escape_char(*f, t);
else
*(t++) = *f;
}
return t;
}
/**
* Convert a string to a unit name. /dev/blah is converted to dev-blah.device,
* /blah/blah is converted to blah-blah.mount, anything else is left alone,
@@ -507,54 +611,75 @@ int unit_name_from_dbus_path(const char *path, char **name) {
*
* If @allow_globs, globs characters are preserved. Otherwise they are escaped.
*/
char *unit_name_mangle_with_suffix(const char *name, enum unit_name_mangle allow_globs, const char *suffix) {
char *r, *t;
int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, const char *suffix, char **ret) {
char *s, *t;
int r;
assert(name);
assert(suffix);
assert(suffix[0] == '.');
assert(ret);
if (is_device_path(name))
return unit_name_from_path(name, ".device");
if (isempty(name)) /* We cannot mangle empty unit names to become valid, sorry. */
return -EINVAL;
if (path_is_absolute(name))
return unit_name_from_path(name, ".mount");
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
r = new(char, strlen(name) * 4 + strlen(suffix) + 1);
if (!r)
return NULL;
if (unit_name_is_valid(name, UNIT_NAME_ANY)) {
/* No mangling necessary... */
s = strdup(name);
if (!s)
return -ENOMEM;
t = do_escape_mangle(name, allow_globs, r);
*ret = s;
return 0;
}
if (unit_name_to_type(name) < 0)
if (is_device_path(name)) {
r = unit_name_from_path(name, ".device", ret);
if (r >= 0)
return 1;
if (r != -EINVAL)
return r;
}
if (path_is_absolute(name)) {
r = unit_name_from_path(name, ".mount", ret);
if (r >= 0)
return 1;
if (r != -EINVAL)
return r;
}
s = new(char, strlen(name) * 4 + strlen(suffix) + 1);
if (!s)
return -ENOMEM;
t = do_escape_mangle(name, allow_globs, s);
*t = 0;
if (unit_name_to_type(s) < 0)
strcpy(t, suffix);
else
*t = 0;
return r;
*ret = s;
return 1;
}
UnitType unit_name_to_type(const char *n) {
const char *e;
assert(n);
e = strrchr(n, '.');
if (!e)
return _UNIT_TYPE_INVALID;
return unit_type_from_string(e + 1);
}
int build_subslice(const char *slice, const char*name, char **subslice) {
char *ret;
int slice_build_subslice(const char *slice, const char*name, char **ret) {
char *subslice;
assert(slice);
assert(name);
assert(subslice);
assert(ret);
if (!unit_name_is_valid(slice, UNIT_NAME_PLAIN))
return -EINVAL;
if (!unit_prefix_is_valid(name))
return -EINVAL;
if (streq(slice, "-.slice"))
ret = strappend(name, ".slice");
subslice = strappend(name, ".slice");
else {
char *e;
@@ -562,17 +687,46 @@ int build_subslice(const char *slice, const char*name, char **subslice) {
if (!e)
return -EINVAL;
ret = new(char, (e - slice) + 1 + strlen(name) + 6 + 1);
if (!ret)
subslice = new(char, (e - slice) + 1 + strlen(name) + 6 + 1);
if (!subslice)
return -ENOMEM;
stpcpy(stpcpy(stpcpy(mempcpy(ret, slice, e - slice), "-"), name), ".slice");
stpcpy(stpcpy(stpcpy(mempcpy(subslice, slice, e - slice), "-"), name), ".slice");
}
*subslice = ret;
*ret = subslice;
return 0;
}
static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "service",
[UNIT_SOCKET] = "socket",
[UNIT_BUSNAME] = "busname",
[UNIT_TARGET] = "target",
[UNIT_SNAPSHOT] = "snapshot",
[UNIT_DEVICE] = "device",
[UNIT_MOUNT] = "mount",
[UNIT_AUTOMOUNT] = "automount",
[UNIT_SWAP] = "swap",
[UNIT_TIMER] = "timer",
[UNIT_PATH] = "path",
[UNIT_SLICE] = "slice",
[UNIT_SCOPE] = "scope"
};
DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
[UNIT_STUB] = "stub",
[UNIT_LOADED] = "loaded",
[UNIT_NOT_FOUND] = "not-found",
[UNIT_ERROR] = "error",
[UNIT_MERGED] = "merged",
[UNIT_MASKED] = "masked"
};
DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState);
static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = {
[UNIT_REQUIRES] = "Requires",
[UNIT_REQUIRES_OVERRIDABLE] = "RequiresOverridable",
src/shared/unit-name.h
+56 -50
View File
@@ -107,61 +107,67 @@ enum UnitDependency {
_UNIT_DEPENDENCY_INVALID = -1
};
typedef enum UnitNameFlags {
UNIT_NAME_PLAIN = 1, /* Allow foo.service */
UNIT_NAME_INSTANCE = 2, /* Allow foo@bar.service */
UNIT_NAME_TEMPLATE = 4, /* Allow foo@.service */
UNIT_NAME_ANY = UNIT_NAME_PLAIN|UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE,
} UnitNameFlags;
bool unit_name_is_valid(const char *n, UnitNameFlags flags) _pure_;
bool unit_prefix_is_valid(const char *p) _pure_;
bool unit_instance_is_valid(const char *i) _pure_;
bool unit_suffix_is_valid(const char *s) _pure_;
static inline int unit_prefix_and_instance_is_valid(const char *p) {
/* For prefix+instance and instance the same rules apply */
return unit_instance_is_valid(p);
}
int unit_name_to_prefix(const char *n, char **prefix);
int unit_name_to_instance(const char *n, char **instance);
int unit_name_to_prefix_and_instance(const char *n, char **ret);
UnitType unit_name_to_type(const char *n) _pure_;
int unit_name_change_suffix(const char *n, const char *suffix, char **ret);
int unit_name_build(const char *prefix, const char *instance, const char *suffix, char **ret);
char *unit_name_escape(const char *f);
int unit_name_unescape(const char *f, char **ret);
int unit_name_path_escape(const char *f, char **ret);
int unit_name_path_unescape(const char *f, char **ret);
int unit_name_replace_instance(const char *f, const char *i, char **ret);
int unit_name_template(const char *f, char **ret);
int unit_name_from_path(const char *path, const char *suffix, char **ret);
int unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix, char **ret);
int unit_name_to_path(const char *name, char **ret);
char *unit_dbus_path_from_name(const char *name);
int unit_name_from_dbus_path(const char *path, char **name);
typedef enum UnitNameMangle {
UNIT_NAME_NOGLOB,
UNIT_NAME_GLOB,
} UnitNameMangle;
int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, const char *suffix, char **ret);
static inline int unit_name_mangle(const char *name, UnitNameMangle allow_globs, char **ret) {
return unit_name_mangle_with_suffix(name, allow_globs, ".service", ret);
}
int slice_build_subslice(const char *slice, const char*name, char **subslice);
const char *unit_type_to_string(UnitType i) _const_;
UnitType unit_type_from_string(const char *s) _pure_;
const char *unit_load_state_to_string(UnitLoadState i) _const_;
UnitLoadState unit_load_state_from_string(const char *s) _pure_;
int unit_name_to_instance(const char *n, char **instance);
char* unit_name_to_prefix(const char *n);
char* unit_name_to_prefix_and_instance(const char *n);
enum template_valid {
TEMPLATE_INVALID,
TEMPLATE_VALID,
};
bool unit_name_is_valid(const char *n, enum template_valid template_ok) _pure_;
bool unit_prefix_is_valid(const char *p) _pure_;
bool unit_instance_is_valid(const char *i) _pure_;
UnitType unit_name_to_type(const char *n) _pure_;
char *unit_name_change_suffix(const char *n, const char *suffix);
char *unit_name_build(const char *prefix, const char *instance, const char *suffix);
char *unit_name_escape(const char *f);
char *unit_name_unescape(const char *f);
char *unit_name_path_escape(const char *f);
char *unit_name_path_unescape(const char *f);
bool unit_name_is_template(const char *n) _pure_;
bool unit_name_is_instance(const char *n) _pure_;
char *unit_name_replace_instance(const char *f, const char *i);
char *unit_name_template(const char *f);
char *unit_name_from_path(const char *path, const char *suffix);
char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix);
char *unit_name_to_path(const char *name);
char *unit_dbus_path_from_name(const char *name);
int unit_name_from_dbus_path(const char *path, char **name);
enum unit_name_mangle {
MANGLE_NOGLOB,
MANGLE_GLOB,
};
char *unit_name_mangle_with_suffix(const char *name, enum unit_name_mangle allow_globs, const char *suffix);
static inline char *unit_name_mangle(const char *name, enum unit_name_mangle allow_globs) {
return unit_name_mangle_with_suffix(name, allow_globs, ".service");
}
int build_subslice(const char *slice, const char*name, char **subslice);
const char *unit_dependency_to_string(UnitDependency i) _const_;
UnitDependency unit_dependency_from_string(const char *s) _pure_;