shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 01:27:11 +03:00
Code
a90fb858ac
systemd/src/test/test-unit-name.c

483 lines
18 KiB
C
Raw Normal View History

systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2012 Lennart Poettering
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
Copyright 2013 Zbigniew Jędrzejewski-Szmek
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
Copyright 2014 Ronny Chevalier
systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
util-lib: split our string related calls from util.[ch] into its own file string-util.[ch] There are more than enough calls doing string manipulations to deserve its own files, hence do something about it. This patch also sorts the #include blocks of all files that needed to be updated, according to the sorting suggestions from CODING_STYLE. Since pretty much every file needs our string manipulation functions this effectively means that most files have sorted #include blocks now. Also touches a few unrelated include files.
2015-10-24 23:58:24 +03:00
#include <pwd.h>
systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
util-lib: split out allocation calls into alloc-util.[ch]
2015-10-27 05:01:06 +03:00
#include "alloc-util.h"
util-lib: split our string related calls from util.[ch] into its own file string-util.[ch] There are more than enough calls doing string manipulations to deserve its own files, hence do something about it. This patch also sorts the #include blocks of all files that needed to be updated, according to the sorting suggestions from CODING_STYLE. Since pretty much every file needs our string manipulation functions this effectively means that most files have sorted #include blocks now. Also touches a few unrelated include files.
2015-10-24 23:58:24 +03:00
#include "hostname-util.h"
#include "macro.h"
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
#include "manager.h"
util-lib: split our string related calls from util.[ch] into its own file string-util.[ch] There are more than enough calls doing string manipulations to deserve its own files, hence do something about it. This patch also sorts the #include blocks of all files that needed to be updated, according to the sorting suggestions from CODING_STYLE. Since pretty much every file needs our string manipulation functions this effectively means that most files have sorted #include blocks now. Also touches a few unrelated include files.
2015-10-24 23:58:24 +03:00
#include "path-util.h"
#include "specifier.h"
#include "string-util.h"
#include "test-helper.h"
systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
#include "unit-name.h"
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
#include "unit-printf.h"
util-lib: split our string related calls from util.[ch] into its own file string-util.[ch] There are more than enough calls doing string manipulations to deserve its own files, hence do something about it. This patch also sorts the #include blocks of all files that needed to be updated, according to the sorting suggestions from CODING_STYLE. Since pretty much every file needs our string manipulation functions this effectively means that most files have sorted #include blocks now. Also touches a few unrelated include files.
2015-10-24 23:58:24 +03:00
#include "unit.h"
core: simplify handling of %u, %U, %s and %h unit file specifiers Previously, the %u, %U, %s and %h specifiers would resolve to the user name, numeric user ID, shell and home directory of the user configured in the User= setting of a unit file, or the user of the manager instance if no User= setting was configured. That at least was the theory. In real-life this was not ever actually useful: - For the systemd --user instance it made no sense to ever set User=, since the instance runs in user context after all, and hence the privileges to change user IDs don't even exist. The four specifiers were actually not useful at all in this case. - For the systemd --system instance we did not allow any resolving that would require NSS. Hence, %s and %h were not supported, unless User=root was set, in which case they would be hardcoded to /bin/sh and /root, to avoid NSS. Then, %u would actually resolve to whatever was set with User=, but %U would only resolve to the numeric UID of that setting if the User= was specified in numeric form, or happened to be root (in which case 0 was hardcoded as mapping). Two of the specifiers are entirely useless in this case, one is realistically also useless, and one is pretty pointless. - Resolving of these settings would only happen if User= was actually set *before* the specifiers where resolved. This behaviour was undocumented and is really ugly, as specifiers should actually be considered something that applies to the whole file equally, independently of order... With this change, %u, %U, %s and %h are drastically simplified: they now always refer to the user that is running the service instance, and the user configured in the unit file is irrelevant. For the system instance of systemd this means they always resolve to "root", "0", "/bin/sh" and "/root", thus avoiding NSS. For the user instance, to the data for the specific user. The new behaviour is identical to the old behaviour in all --user cases and for all units that have no User= set (or set to "0" or "root").
2015-11-01 00:12:51 +03:00
#include "user-util.h"
systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
#include "util.h"
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_unit_name_is_valid(void) {
assert_se(unit_name_is_valid("foo.service", UNIT_NAME_ANY));
assert_se(unit_name_is_valid("foo.service", UNIT_NAME_PLAIN));
assert_se(!unit_name_is_valid("foo.service", UNIT_NAME_INSTANCE));
assert_se(!unit_name_is_valid("foo.service", UNIT_NAME_TEMPLATE));
assert_se(!unit_name_is_valid("foo.service", UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE));
assert_se(unit_name_is_valid("foo@bar.service", UNIT_NAME_ANY));
assert_se(!unit_name_is_valid("foo@bar.service", UNIT_NAME_PLAIN));
assert_se(unit_name_is_valid("foo@bar.service", UNIT_NAME_INSTANCE));
assert_se(!unit_name_is_valid("foo@bar.service", UNIT_NAME_TEMPLATE));
assert_se(unit_name_is_valid("foo@bar.service", UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE));
assert_se(unit_name_is_valid("foo@.service", UNIT_NAME_ANY));
assert_se(!unit_name_is_valid("foo@.service", UNIT_NAME_PLAIN));
assert_se(!unit_name_is_valid("foo@.service", UNIT_NAME_INSTANCE));
assert_se(unit_name_is_valid("foo@.service", UNIT_NAME_TEMPLATE));
assert_se(unit_name_is_valid("foo@.service", UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE));
assert_se(!unit_name_is_valid(".service", UNIT_NAME_ANY));
assert_se(!unit_name_is_valid("", UNIT_NAME_ANY));
assert_se(!unit_name_is_valid("foo.waldo", UNIT_NAME_ANY));
assert_se(!unit_name_is_valid("@.service", UNIT_NAME_ANY));
assert_se(!unit_name_is_valid("@piep.service", UNIT_NAME_ANY));
}
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_u_n_r_i_one(const char *pattern, const char *repl, const char *expected, int ret) {
_cleanup_free_ char *t = NULL;
assert_se(unit_name_replace_instance(pattern, repl, &t) == ret);
puts(strna(t));
assert_se(streq_ptr(t, expected));
}
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_u_n_r_i(void) {
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
puts("-------------------------------------------------");
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
test_u_n_r_i_one("foo@.service", "waldo", "foo@waldo.service", 0);
test_u_n_r_i_one("foo@xyz.service", "waldo", "foo@waldo.service", 0);
test_u_n_r_i_one("xyz", "waldo", NULL, -EINVAL);
test_u_n_r_i_one("", "waldo", NULL, -EINVAL);
test_u_n_r_i_one("foo.service", "waldo", NULL, -EINVAL);
test_u_n_r_i_one(".service", "waldo", NULL, -EINVAL);
test_u_n_r_i_one("foo@", "waldo", NULL, -EINVAL);
test_u_n_r_i_one("@bar", "waldo", NULL, -EINVAL);
}
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_u_n_f_p_one(const char *path, const char *suffix, const char *expected, int ret) {
_cleanup_free_ char *t = NULL;
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_from_path(path, suffix, &t) == ret);
puts(strna(t));
assert_se(streq_ptr(t, expected));
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
if (t) {
_cleanup_free_ char *k = NULL;
assert_se(unit_name_to_path(t, &k) == 0);
puts(strna(k));
assert_se(path_equal(k, isempty(path) ? "/" : path));
}
}
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_u_n_f_p(void) {
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
puts("-------------------------------------------------");
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
test_u_n_f_p_one("/waldo", ".mount", "waldo.mount", 0);
test_u_n_f_p_one("/waldo/quuix", ".mount", "waldo-quuix.mount", 0);
test_u_n_f_p_one("/waldo/quuix/", ".mount", "waldo-quuix.mount", 0);
test_u_n_f_p_one("", ".mount", "-.mount", 0);
test_u_n_f_p_one("/", ".mount", "-.mount", 0);
test_u_n_f_p_one("///", ".mount", "-.mount", 0);
test_u_n_f_p_one("/foo/../bar", ".mount", NULL, -EINVAL);
test_u_n_f_p_one("/foo/./bar", ".mount", NULL, -EINVAL);
}
static void test_u_n_f_p_i_one(const char *pattern, const char *path, const char *suffix, const char *expected, int ret) {
_cleanup_free_ char *t = NULL;
assert_se(unit_name_from_path_instance(pattern, path, suffix, &t) == ret);
puts(strna(t));
assert_se(streq_ptr(t, expected));
if (t) {
_cleanup_free_ char *k = NULL, *v = NULL;
assert_se(unit_name_to_instance(t, &k) > 0);
assert_se(unit_name_path_unescape(k, &v) == 0);
assert_se(path_equal(v, isempty(path) ? "/" : path));
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
}
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
}
tests: compress unit name tests and add more asserts
2013-01-29 23:39:32 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_u_n_f_p_i(void) {
puts("-------------------------------------------------");
systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
test_u_n_f_p_i_one("waldo", "/waldo", ".mount", "waldo@waldo.mount", 0);
test_u_n_f_p_i_one("waldo", "/waldo////quuix////", ".mount", "waldo@waldo-quuix.mount", 0);
test_u_n_f_p_i_one("waldo", "/", ".mount", "waldo@-.mount", 0);
test_u_n_f_p_i_one("waldo", "", ".mount", "waldo@-.mount", 0);
test_u_n_f_p_i_one("waldo", "///", ".mount", "waldo@-.mount", 0);
test_u_n_f_p_i_one("waldo", "..", ".mount", NULL, -EINVAL);
test_u_n_f_p_i_one("waldo", "/foo", ".waldi", NULL, -EINVAL);
test_u_n_f_p_i_one("wa--ldo", "/--", ".mount", "wa--ldo@\\x2d\\x2d.mount", 0);
}
static void test_u_n_t_p_one(const char *unit, const char *path, int ret) {
_cleanup_free_ char *p = NULL;
assert_se(unit_name_to_path(unit, &p) == ret);
assert_se(streq_ptr(path, p));
}
static void test_u_n_t_p(void) {
test_u_n_t_p_one("home.mount", "/home", 0);
test_u_n_t_p_one("home-lennart.mount", "/home/lennart", 0);
test_u_n_t_p_one("home-lennart-.mount", NULL, -EINVAL);
test_u_n_t_p_one("-home-lennart.mount", NULL, -EINVAL);
test_u_n_t_p_one("-home--lennart.mount", NULL, -EINVAL);
test_u_n_t_p_one("home-..-lennart.mount", NULL, -EINVAL);
test_u_n_t_p_one("", NULL, -EINVAL);
test_u_n_t_p_one("home/foo", NULL, -EINVAL);
}
static void test_u_n_m_one(const char *pattern, const char *expect, int ret) {
_cleanup_free_ char *t = NULL;
assert_se(unit_name_mangle(pattern, UNIT_NAME_NOGLOB, &t) == ret);
puts(strna(t));
assert_se(streq_ptr(t, expect));
if (t) {
_cleanup_free_ char *k = NULL;
assert_se(unit_name_is_valid(t, UNIT_NAME_ANY));
assert_se(unit_name_mangle(t, UNIT_NAME_NOGLOB, &k) == 0);
assert_se(streq_ptr(t, k));
}
}
static void test_u_n_m(void) {
puts("-------------------------------------------------");
test_u_n_m_one("foo.service", "foo.service", 0);
test_u_n_m_one("/home", "home.mount", 1);
test_u_n_m_one("/dev/sda", "dev-sda.device", 1);
test_u_n_m_one("üxknürz.service", "\\xc3\\xbcxkn\\xc3\\xbcrz.service", 1);
test_u_n_m_one("foobar-meh...waldi.service", "foobar-meh...waldi.service", 0);
test_u_n_m_one("_____####----.....service", "_____\\x23\\x23\\x23\\x23----.....service", 1);
test_u_n_m_one("_____##@;;;,,,##----.....service", "_____\\x23\\x23@\\x3b\\x3b\\x3b\\x2c\\x2c\\x2c\\x23\\x23----.....service", 1);
test_u_n_m_one("xxx@@@@/////\\\\\\\\\\yyy.service", "xxx@@@@-----\\\\\\\\\\yyy.service", 1);
test_u_n_m_one("", NULL, -EINVAL);
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
}
tests: skip bus test if bus cannot be opened To make the result more visible, special return value is used to tell automake that the test was skipped. While at it, use the same return value in other skipped tests.
2013-03-27 05:07:46 +04:00
static int test_unit_printf(void) {
make gcc shut up If -flto is used then gcc will generate a lot more warnings than before, among them a number of use-without-initialization warnings. Most of them without are false positives, but let's make them go away, because it doesn't really matter.
2014-02-19 20:47:11 +04:00
Manager *m = NULL;
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
Unit *u, *u2;
tests: skip tests if manager cannot be created When running without a user session, tests fail.
2013-02-07 02:35:53 +04:00
int r;
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
core: simplify handling of %u, %U, %s and %h unit file specifiers Previously, the %u, %U, %s and %h specifiers would resolve to the user name, numeric user ID, shell and home directory of the user configured in the User= setting of a unit file, or the user of the manager instance if no User= setting was configured. That at least was the theory. In real-life this was not ever actually useful: - For the systemd --user instance it made no sense to ever set User=, since the instance runs in user context after all, and hence the privileges to change user IDs don't even exist. The four specifiers were actually not useful at all in this case. - For the systemd --system instance we did not allow any resolving that would require NSS. Hence, %s and %h were not supported, unless User=root was set, in which case they would be hardcoded to /bin/sh and /root, to avoid NSS. Then, %u would actually resolve to whatever was set with User=, but %U would only resolve to the numeric UID of that setting if the User= was specified in numeric form, or happened to be root (in which case 0 was hardcoded as mapping). Two of the specifiers are entirely useless in this case, one is realistically also useless, and one is pretty pointless. - Resolving of these settings would only happen if User= was actually set *before* the specifiers where resolved. This behaviour was undocumented and is really ugly, as specifiers should actually be considered something that applies to the whole file equally, independently of order... With this change, %u, %U, %s and %h are drastically simplified: they now always refer to the user that is running the service instance, and the user configured in the unit file is irrelevant. For the system instance of systemd this means they always resolve to "root", "0", "/bin/sh" and "/root", thus avoiding NSS. For the user instance, to the data for the specific user. The new behaviour is identical to the old behaviour in all --user cases and for all units that have no User= set (or set to "0" or "root").
2015-11-01 00:12:51 +03:00
_cleanup_free_ char *mid = NULL, *bid = NULL, *host = NULL, *uid = NULL, *user = NULL, *shell = NULL, *home = NULL;
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
specifier: rework specifier calls to return proper error message Previously the specifier calls could only indicate OOM by returning NULL. With this change they will return negative errno-style error codes like everything else.
2013-09-17 19:03:46 +04:00
assert_se(specifier_machine_id('m', NULL, NULL, &mid) >= 0 && mid);
assert_se(specifier_boot_id('b', NULL, NULL, &bid) >= 0 && bid);
core: simplify handling of %u, %U, %s and %h unit file specifiers Previously, the %u, %U, %s and %h specifiers would resolve to the user name, numeric user ID, shell and home directory of the user configured in the User= setting of a unit file, or the user of the manager instance if no User= setting was configured. That at least was the theory. In real-life this was not ever actually useful: - For the systemd --user instance it made no sense to ever set User=, since the instance runs in user context after all, and hence the privileges to change user IDs don't even exist. The four specifiers were actually not useful at all in this case. - For the systemd --system instance we did not allow any resolving that would require NSS. Hence, %s and %h were not supported, unless User=root was set, in which case they would be hardcoded to /bin/sh and /root, to avoid NSS. Then, %u would actually resolve to whatever was set with User=, but %U would only resolve to the numeric UID of that setting if the User= was specified in numeric form, or happened to be root (in which case 0 was hardcoded as mapping). Two of the specifiers are entirely useless in this case, one is realistically also useless, and one is pretty pointless. - Resolving of these settings would only happen if User= was actually set *before* the specifiers where resolved. This behaviour was undocumented and is really ugly, as specifiers should actually be considered something that applies to the whole file equally, independently of order... With this change, %u, %U, %s and %h are drastically simplified: they now always refer to the user that is running the service instance, and the user configured in the unit file is irrelevant. For the system instance of systemd this means they always resolve to "root", "0", "/bin/sh" and "/root", thus avoiding NSS. For the user instance, to the data for the specific user. The new behaviour is identical to the old behaviour in all --user cases and for all units that have no User= set (or set to "0" or "root").
2015-11-01 00:12:51 +03:00
assert_se(host = gethostname_malloc());
assert_se(user = getusername_malloc());
assert_se(asprintf(&uid, UID_FMT, getuid()));
assert_se(get_home_dir(&home) >= 0);
assert_se(get_shell(&shell) >= 0);
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
core: rename SystemdRunningAs to ManagerRunningAs It's primarily just a property of the Manager object after all, and we try to refer to PID 1 as "manager" instead of "systemd", hence let's to stick to this here too.
2015-05-11 23:51:49 +03:00
r = manager_new(MANAGER_USER, true, &m);
test: exit early if we would conflict with running user systemd
2013-11-20 00:01:24 +04:00
if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) {
tests: skip tests if manager cannot be created When running without a user session, tests fail.
2013-02-07 02:35:53 +04:00
puts("manager_new: Permission denied. Skipping test.");
tests: skip bus test if bus cannot be opened To make the result more visible, special return value is used to tell automake that the test was skipped. While at it, use the same return value in other skipped tests.
2013-03-27 05:07:46 +04:00
return EXIT_TEST_SKIP;
tests: skip tests if manager cannot be created When running without a user session, tests fail.
2013-02-07 02:35:53 +04:00
}
test: only use assert_se The asserts used in the tests should never be allowed to be optimized away
2014-10-05 01:51:45 +04:00
assert_se(r == 0);
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
#define expect(unit, pattern, expected) \
{ \
tests: run manager in session mode False positives pop up otherwise. FAIL: test-unit-name (exit: 134) ================================ Failed to open /dev/tty0: Permission denied Failed to create root cgroup hierarchy: Permission denied Assertion 'manager_new(SYSTEMD_SYSTEM, &m) == 0' failed at src/test/test-unit-name.c:125, function test_unit_printf(). Aborting.
2013-02-07 02:03:12 +04:00
char *e; \
tests: fix minor memory leak
2014-11-19 18:43:41 +03:00
_cleanup_free_ char *t = NULL; \
specifier: rework specifier calls to return proper error message Previously the specifier calls could only indicate OOM by returning NULL. With this change they will return negative errno-style error codes like everything else.
2013-09-17 19:03:46 +04:00
assert_se(unit_full_printf(unit, pattern, &t) >= 0); \
tests: skip tests if manager cannot be created When running without a user session, tests fail.
2013-02-07 02:35:53 +04:00
printf("result: %s\nexpect: %s\n", t, expected); \
tests: run manager in session mode False positives pop up otherwise. FAIL: test-unit-name (exit: 134) ================================ Failed to open /dev/tty0: Permission denied Failed to create root cgroup hierarchy: Permission denied Assertion 'manager_new(SYSTEMD_SYSTEM, &m) == 0' failed at src/test/test-unit-name.c:125, function test_unit_printf(). Aborting.
2013-02-07 02:03:12 +04:00
if ((e = endswith(expected, "*"))) \
test: only use assert_se The asserts used in the tests should never be allowed to be optimized away
2014-10-05 01:51:45 +04:00
assert_se(strncmp(t, e, e-expected)); \
tests: run manager in session mode False positives pop up otherwise. FAIL: test-unit-name (exit: 134) ================================ Failed to open /dev/tty0: Permission denied Failed to create root cgroup hierarchy: Permission denied Assertion 'manager_new(SYSTEMD_SYSTEM, &m) == 0' failed at src/test/test-unit-name.c:125, function test_unit_printf(). Aborting.
2013-02-07 02:03:12 +04:00
else \
test: only use assert_se The asserts used in the tests should never be allowed to be optimized away
2014-10-05 01:51:45 +04:00
assert_se(streq(t, expected)); \
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
}
tests: add missing XDG_RUNTIME_DIR env variable Otherwise the test fails because specifier_runtime() returns -ENOTSUP when XDG_RUNTIME_DIR is not set.
2014-06-11 23:20:52 +04:00
assert_se(setenv("XDG_RUNTIME_DIR", "/run/user/1/", 1) == 0);
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
assert_se(u = unit_new(m, sizeof(Service)));
assert_se(unit_add_name(u, "blah.service") == 0);
assert_se(unit_add_name(u, "blah.service") == 0);
/* general tests */
expect(u, "%%", "%");
expect(u, "%%s", "%s");
expect(u, "%", ""); // REALLY?
/* normal unit */
expect(u, "%n", "blah.service");
test-unit-name: add tests for %f
2014-12-11 19:58:40 +03:00
expect(u, "%f", "/blah");
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
expect(u, "%N", "blah");
expect(u, "%p", "blah");
expect(u, "%P", "blah");
expect(u, "%i", "");
core: simplify handling of %u, %U, %s and %h unit file specifiers Previously, the %u, %U, %s and %h specifiers would resolve to the user name, numeric user ID, shell and home directory of the user configured in the User= setting of a unit file, or the user of the manager instance if no User= setting was configured. That at least was the theory. In real-life this was not ever actually useful: - For the systemd --user instance it made no sense to ever set User=, since the instance runs in user context after all, and hence the privileges to change user IDs don't even exist. The four specifiers were actually not useful at all in this case. - For the systemd --system instance we did not allow any resolving that would require NSS. Hence, %s and %h were not supported, unless User=root was set, in which case they would be hardcoded to /bin/sh and /root, to avoid NSS. Then, %u would actually resolve to whatever was set with User=, but %U would only resolve to the numeric UID of that setting if the User= was specified in numeric form, or happened to be root (in which case 0 was hardcoded as mapping). Two of the specifiers are entirely useless in this case, one is realistically also useless, and one is pretty pointless. - Resolving of these settings would only happen if User= was actually set *before* the specifiers where resolved. This behaviour was undocumented and is really ugly, as specifiers should actually be considered something that applies to the whole file equally, independently of order... With this change, %u, %U, %s and %h are drastically simplified: they now always refer to the user that is running the service instance, and the user configured in the unit file is irrelevant. For the system instance of systemd this means they always resolve to "root", "0", "/bin/sh" and "/root", thus avoiding NSS. For the user instance, to the data for the specific user. The new behaviour is identical to the old behaviour in all --user cases and for all units that have no User= set (or set to "0" or "root").
2015-11-01 00:12:51 +03:00
expect(u, "%u", user);
expect(u, "%U", uid);
expect(u, "%h", home);
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
expect(u, "%m", mid);
expect(u, "%b", bid);
expect(u, "%H", host);
tests: run manager in session mode False positives pop up otherwise. FAIL: test-unit-name (exit: 134) ================================ Failed to open /dev/tty0: Permission denied Failed to create root cgroup hierarchy: Permission denied Assertion 'manager_new(SYSTEMD_SYSTEM, &m) == 0' failed at src/test/test-unit-name.c:125, function test_unit_printf(). Aborting.
2013-02-07 02:03:12 +04:00
expect(u, "%t", "/run/user/*");
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
/* templated */
assert_se(u2 = unit_new(m, sizeof(Service)));
assert_se(unit_add_name(u2, "blah@foo-foo.service") == 0);
assert_se(unit_add_name(u2, "blah@foo-foo.service") == 0);
expect(u2, "%n", "blah@foo-foo.service");
expect(u2, "%N", "blah@foo-foo");
test-unit-name: add tests for %f
2014-12-11 19:58:40 +03:00
expect(u2, "%f", "/foo/foo");
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
expect(u2, "%p", "blah");
expect(u2, "%P", "blah");
expect(u2, "%i", "foo-foo");
expect(u2, "%I", "foo/foo");
core: simplify handling of %u, %U, %s and %h unit file specifiers Previously, the %u, %U, %s and %h specifiers would resolve to the user name, numeric user ID, shell and home directory of the user configured in the User= setting of a unit file, or the user of the manager instance if no User= setting was configured. That at least was the theory. In real-life this was not ever actually useful: - For the systemd --user instance it made no sense to ever set User=, since the instance runs in user context after all, and hence the privileges to change user IDs don't even exist. The four specifiers were actually not useful at all in this case. - For the systemd --system instance we did not allow any resolving that would require NSS. Hence, %s and %h were not supported, unless User=root was set, in which case they would be hardcoded to /bin/sh and /root, to avoid NSS. Then, %u would actually resolve to whatever was set with User=, but %U would only resolve to the numeric UID of that setting if the User= was specified in numeric form, or happened to be root (in which case 0 was hardcoded as mapping). Two of the specifiers are entirely useless in this case, one is realistically also useless, and one is pretty pointless. - Resolving of these settings would only happen if User= was actually set *before* the specifiers where resolved. This behaviour was undocumented and is really ugly, as specifiers should actually be considered something that applies to the whole file equally, independently of order... With this change, %u, %U, %s and %h are drastically simplified: they now always refer to the user that is running the service instance, and the user configured in the unit file is irrelevant. For the system instance of systemd this means they always resolve to "root", "0", "/bin/sh" and "/root", thus avoiding NSS. For the user instance, to the data for the specific user. The new behaviour is identical to the old behaviour in all --user cases and for all units that have no User= set (or set to "0" or "root").
2015-11-01 00:12:51 +03:00
expect(u2, "%u", user);
expect(u2, "%U", uid);
expect(u2, "%h", home);
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
expect(u2, "%m", mid);
expect(u2, "%b", bid);
expect(u2, "%H", host);
tests: run manager in session mode False positives pop up otherwise. FAIL: test-unit-name (exit: 134) ================================ Failed to open /dev/tty0: Permission denied Failed to create root cgroup hierarchy: Permission denied Assertion 'manager_new(SYSTEMD_SYSTEM, &m) == 0' failed at src/test/test-unit-name.c:125, function test_unit_printf(). Aborting.
2013-02-07 02:03:12 +04:00
expect(u2, "%t", "/run/user/*");
tests: skip bus test if bus cannot be opened To make the result more visible, special return value is used to tell automake that the test was skipped. While at it, use the same return value in other skipped tests.
2013-03-27 05:07:46 +04:00
test-path-util,test-sched-prio: uninitialize manager to appease valgrind
2013-07-12 16:04:39 +04:00
manager_free(m);
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
#undef expect
test-path-util,test-sched-prio: uninitialize manager to appease valgrind
2013-07-12 16:04:39 +04:00
tests: skip bus test if bus cannot be opened To make the result more visible, special return value is used to tell automake that the test was skipped. While at it, use the same return value in other skipped tests.
2013-03-27 05:07:46 +04:00
return 0;
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
}
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
static void test_unit_instance_is_valid(void) {
assert_se(unit_instance_is_valid("fooBar"));
assert_se(unit_instance_is_valid("foo-bar"));
assert_se(unit_instance_is_valid("foo.stUff"));
assert_se(unit_instance_is_valid("fOo123.stuff"));
assert_se(unit_instance_is_valid("@f_oo123.Stuff"));
assert_se(!unit_instance_is_valid("$¢£"));
assert_se(!unit_instance_is_valid(""));
assert_se(!unit_instance_is_valid("foo bar"));
assert_se(!unit_instance_is_valid("foo/bar"));
}
static void test_unit_prefix_is_valid(void) {
assert_se(unit_prefix_is_valid("fooBar"));
assert_se(unit_prefix_is_valid("foo-bar"));
assert_se(unit_prefix_is_valid("foo.stUff"));
assert_se(unit_prefix_is_valid("fOo123.stuff"));
assert_se(unit_prefix_is_valid("foo123.Stuff"));
assert_se(!unit_prefix_is_valid("$¢£"));
assert_se(!unit_prefix_is_valid(""));
assert_se(!unit_prefix_is_valid("foo bar"));
assert_se(!unit_prefix_is_valid("foo/bar"));
assert_se(!unit_prefix_is_valid("@foo-bar"));
}
static void test_unit_name_change_suffix(void) {
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
char *t;
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_change_suffix("foo.mount", ".service", &t) == 0);
assert_se(streq(t, "foo.service"));
free(t);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_change_suffix("foo@stuff.service", ".socket", &t) == 0);
assert_se(streq(t, "foo@stuff.socket"));
free(t);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
}
static void test_unit_name_build(void) {
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
char *t;
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_build("foo", "bar", ".service", &t) == 0);
assert_se(streq(t, "foo@bar.service"));
free(t);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_build("fo0-stUff_b", "bar", ".mount", &t) == 0);
assert_se(streq(t, "fo0-stUff_b@bar.mount"));
free(t);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_build("foo", NULL, ".service", &t) == 0);
assert_se(streq(t, "foo.service"));
free(t);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
}
core: be more strict when manipulating slices names and unescaping paths from unit names Let's better be safe then sorry.
2015-05-05 23:39:14 +03:00
static void test_slice_name_is_valid(void) {
assert_se(slice_name_is_valid("-.slice"));
assert_se(slice_name_is_valid("foo.slice"));
assert_se(slice_name_is_valid("foo-bar.slice"));
assert_se(slice_name_is_valid("foo-bar-baz.slice"));
assert_se(!slice_name_is_valid("-foo-bar-baz.slice"));
assert_se(!slice_name_is_valid("foo-bar-baz-.slice"));
assert_se(!slice_name_is_valid("-foo-bar-baz-.slice"));
assert_se(!slice_name_is_valid("foo-bar--baz.slice"));
assert_se(!slice_name_is_valid("foo--bar--baz.slice"));
assert_se(!slice_name_is_valid(".slice"));
assert_se(!slice_name_is_valid(""));
assert_se(!slice_name_is_valid("foo.service"));
}
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
static void test_build_subslice(void) {
char *a;
char *b;
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(slice_build_subslice("-.slice", "foo", &a) >= 0);
assert_se(slice_build_subslice(a, "bar", &b) >= 0);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
free(a);
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(slice_build_subslice(b, "barfoo", &a) >= 0);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
free(b);
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(slice_build_subslice(a, "foobar", &b) >= 0);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
free(a);
assert_se(streq(b, "foo-bar-barfoo-foobar.slice"));
free(b);
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(slice_build_subslice("foo.service", "bar", &a) < 0);
assert_se(slice_build_subslice("foo", "bar", &a) < 0);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
}
core: be more strict when manipulating slices names and unescaping paths from unit names Let's better be safe then sorry.
2015-05-05 23:39:14 +03:00
static void test_build_parent_slice_one(const char *name, const char *expect, int ret) {
_cleanup_free_ char *s = NULL;
assert_se(slice_build_parent_slice(name, &s) == ret);
assert_se(streq_ptr(s, expect));
}
static void test_build_parent_slice(void) {
test_build_parent_slice_one("-.slice", NULL, 0);
test_build_parent_slice_one("foo.slice", "-.slice", 1);
test_build_parent_slice_one("foo-bar.slice", "foo.slice", 1);
test_build_parent_slice_one("foo-bar-baz.slice", "foo-bar.slice", 1);
test_build_parent_slice_one("foo-bar--baz.slice", NULL, -EINVAL);
test_build_parent_slice_one("-foo-bar.slice", NULL, -EINVAL);
test_build_parent_slice_one("foo-bar-.slice", NULL, -EINVAL);
test_build_parent_slice_one("foo-bar.service", NULL, -EINVAL);
test_build_parent_slice_one(".slice", NULL, -EINVAL);
}
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
static void test_unit_name_to_instance(void) {
char *instance;
int r;
r = unit_name_to_instance("foo@bar.service", &instance);
assert_se(r >= 0);
assert_se(streq(instance, "bar"));
free(instance);
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
r = unit_name_to_instance("foo@.service", &instance);
assert_se(r >= 0);
assert_se(streq(instance, ""));
free(instance);
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
r = unit_name_to_instance("fo0-stUff_b@b.service", &instance);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
assert_se(r >= 0);
assert_se(streq(instance, "b"));
free(instance);
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
r = unit_name_to_instance("foo.service", &instance);
assert_se(r == 0);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
assert_se(!instance);
r = unit_name_to_instance("fooj@unk", &instance);
assert_se(r < 0);
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
r = unit_name_to_instance("foo@", &instance);
assert_se(r < 0);
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
}
static void test_unit_name_escape(void) {
_cleanup_free_ char *r;
r = unit_name_escape("ab+-c.a/bc@foo.service");
assert_se(r);
assert_se(streq(r, "ab\\x2b\\x2dc.a-bc\\x40foo.service"));
}
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
static void test_u_n_t_one(const char *name, const char *expected, int ret) {
_cleanup_free_ char *f = NULL;
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
assert_se(unit_name_template(name, &f) == ret);
printf("got: %s, expected: %s\n", strna(f), strna(expected));
assert_se(streq_ptr(f, expected));
}
static void test_unit_name_template(void) {
test_u_n_t_one("foo@bar.service", "foo@.service", 0);
test_u_n_t_one("foo.mount", NULL, -EINVAL);
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
}
core: be more strict when manipulating slices names and unescaping paths from unit names Let's better be safe then sorry.
2015-05-05 23:39:14 +03:00
static void test_unit_name_path_unescape_one(const char *name, const char *path, int ret) {
_cleanup_free_ char *p = NULL;
assert_se(unit_name_path_unescape(name, &p) == ret);
assert_se(streq_ptr(path, p));
}
static void test_unit_name_path_unescape(void) {
test_unit_name_path_unescape_one("foo", "/foo", 0);
test_unit_name_path_unescape_one("foo-bar", "/foo/bar", 0);
test_unit_name_path_unescape_one("foo-.bar", "/foo/.bar", 0);
test_unit_name_path_unescape_one("foo-bar-baz", "/foo/bar/baz", 0);
test_unit_name_path_unescape_one("-", "/", 0);
test_unit_name_path_unescape_one("--", NULL, -EINVAL);
test_unit_name_path_unescape_one("-foo-bar", NULL, -EINVAL);
test_unit_name_path_unescape_one("foo--bar", NULL, -EINVAL);
test_unit_name_path_unescape_one("foo-bar-", NULL, -EINVAL);
test_unit_name_path_unescape_one(".-bar", NULL, -EINVAL);
test_unit_name_path_unescape_one("foo-..", NULL, -EINVAL);
test_unit_name_path_unescape_one("", NULL, -EINVAL);
}
tests: add test for unit name printing
2013-01-30 00:25:36 +04:00
int main(int argc, char* argv[]) {
test: Make testing work on systems without or old systemd * Introduce a macro to conditionally execute tests. This avoids skipping the entire test if some parts require systemd * Skip the journal tests when no /etc/machine-id is present * Change test-catalog to load the catalog from the source directory of systemd. * /proc/PID/comm got introduced in v2.6.33 but travis is still using v2.6.32. * Enable make check and make distcheck on the travis build * Use -D"CATALOG_DIR=STR($(abs_top_srcdir)/catalog)" as a STRINGIY would result in the path '/home/ich/source/linux' to be expanded to '/home/ich/source/1' as linux is defined to 1.
2013-07-18 10:30:06 +04:00
int rc = 0;
core: rework unit name validation and manipulation logic 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
2015-04-30 21:21:00 +03:00
test_unit_name_is_valid();
test_u_n_r_i();
test_u_n_f_p();
test_u_n_f_p_i();
test_u_n_m();
test_u_n_t_p();
test: Make testing work on systems without or old systemd * Introduce a macro to conditionally execute tests. This avoids skipping the entire test if some parts require systemd * Skip the journal tests when no /etc/machine-id is present * Change test-catalog to load the catalog from the source directory of systemd. * /proc/PID/comm got introduced in v2.6.33 but travis is still using v2.6.32. * Enable make check and make distcheck on the travis build * Use -D"CATALOG_DIR=STR($(abs_top_srcdir)/catalog)" as a STRINGIY would result in the path '/home/ich/source/linux' to be expanded to '/home/ich/source/1' as linux is defined to 1.
2013-07-18 10:30:06 +04:00
TEST_REQ_RUNNING_SYSTEMD(rc = test_unit_printf());
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
test_unit_instance_is_valid();
test_unit_prefix_is_valid();
test_unit_name_change_suffix();
test_unit_name_build();
core: be more strict when manipulating slices names and unescaping paths from unit names Let's better be safe then sorry.
2015-05-05 23:39:14 +03:00
test_slice_name_is_valid();
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
test_build_subslice();
core: be more strict when manipulating slices names and unescaping paths from unit names Let's better be safe then sorry.
2015-05-05 23:39:14 +03:00
test_build_parent_slice();
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
test_unit_name_to_instance();
test_unit_name_escape();
test-unit-name: add more tests Add more test cases for: - unit_name_is_instance - unit_name_to_instance Add tests for: - unit_name_template - unit_name_is_template
2014-12-13 17:12:38 +03:00
test_unit_name_template();
core: be more strict when manipulating slices names and unescaping paths from unit names Let's better be safe then sorry.
2015-05-05 23:39:14 +03:00
test_unit_name_path_unescape();
tests: add tests to test-unit-name add tests for: - unit_instance_is_valid - unit_prefix_is_valid - unit_name_change_suffix - unit_name_build - unit_name_is_instance - build_subslice - unit_name_to_instance - unit_name_escape
2014-06-23 23:28:21 +04:00
test: Make testing work on systems without or old systemd * Introduce a macro to conditionally execute tests. This avoids skipping the entire test if some parts require systemd * Skip the journal tests when no /etc/machine-id is present * Change test-catalog to load the catalog from the source directory of systemd. * /proc/PID/comm got introduced in v2.6.33 but travis is still using v2.6.32. * Enable make check and make distcheck on the travis build * Use -D"CATALOG_DIR=STR($(abs_top_srcdir)/catalog)" as a STRINGIY would result in the path '/home/ich/source/linux' to be expanded to '/home/ich/source/1' as linux is defined to 1.
2013-07-18 10:30:06 +04:00
return rc;
systemctl: automatically turn paths and unescaped unit names into proper unit names This makes sure that systemctl status /home is implicitly translated to: systemctl status /home.mount Similar, /dev/foobar becomes dev-foobar.device. Also, all characters that cannot be part of a unit name are implicitly escaped.
2012-06-22 15:08:48 +04:00
}
Copy Permalink