shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 03:25:31 +03:00
Code

Merge pull request #5231 from keszybz/mask-wants

Browse Source 
Mask individual .wants/.requires symlinks
This commit is contained in:
Lennart Poettering 2017-02-08 14:50:56 +01:00 committed by GitHub
commit b6f08ecda9
11 changed files with 473 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/basic/conf-files.c
View File

@ -43,7 +43,6 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
int r;
assert(path);
assert(suffix);
dirpath = prefix_roota(root, path);
@ -94,7 +93,6 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
int r;
assert(strv);
assert(suffix);
/* This alters the dirs string array */
if (!path_strv_resolve_uniq(dirs, root))
@ -126,7 +124,6 @@ int conf_files_list_strv(char ***strv, const char *suffix, const char *root, con
_cleanup_strv_free_ char **copy = NULL;
assert(strv);
assert(suffix);
copy = strv_copy((char**) dirs);
if (!copy)

3
src/basic/dirent-util.c
View File

@ -70,5 +70,8 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
if (de->d_name[0] == '.')
return false;
if (!suffix)
return true;
return endswith(de->d_name, suffix);
}

116
src/core/load-dropin.c
View File

@ -19,53 +19,121 @@
#include "conf-parser.h"
#include "fs-util.h"
#include "load-dropin.h"
#include "load-fragment.h"
#include "log.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "unit-name.h"
#include "unit.h"
static int add_dependency_consumer(
UnitDependency dependency,
const char *entry,
const char* filepath,
void *arg) {
Unit *u = arg;
static bool unit_name_compatible(const char *a, const char *b) {
_cleanup_free_ char *prefix = NULL;
int r;
assert(u);
/* the straightforward case: the symlink name matches the target */
if (streq(a, b))
return true;
r = unit_add_dependency_by_name(u, dependency, entry, filepath, true);
r = unit_name_template(a, &prefix);
if (r < 0) {
log_oom();
return true;
}
/* an instance name points to a target that is just the template name */
if (streq(prefix, b))
return true;
return false;
}
static int process_deps(Unit *u, UnitDependency dependency, const char *dir_suffix) {
_cleanup_strv_free_ char **paths = NULL;
char **p;
int r;
r = unit_file_find_dropin_paths(NULL,
u->manager->lookup_paths.search_path,
u->manager->unit_path_cache,
dir_suffix,
NULL,
u->names,
&paths);
if (r < 0)
log_error_errno(r, "Cannot add dependency %s to %s, ignoring: %m", entry, u->id);
return r;
STRV_FOREACH(p, paths) {
const char *entry;
_cleanup_free_ char *target = NULL;
entry = basename(*p);
if (null_or_empty_path(*p) > 0) {
/* an error usually means an invalid symlink, which is not a mask */
log_unit_debug(u, "%s dependency on %s is masked by %s, ignoring.",
unit_dependency_to_string(dependency), entry, *p);
continue;
}
r = is_symlink(*p);
if (r < 0) {
log_unit_warning_errno(u, r, "%s dropin %s unreadable, ignoring: %m",
unit_dependency_to_string(dependency), *p);
continue;
}
if (r == 0) {
log_unit_warning(u, "%s dependency dropin %s is not a symlink, ignoring.",
unit_dependency_to_string(dependency), *p);
continue;
}
if (!unit_name_is_valid(entry, UNIT_NAME_ANY)) {
log_unit_warning(u, "%s dependency dropin %s is not a valid unit name, ignoring.",
unit_dependency_to_string(dependency), *p);
continue;
}
r = readlink_malloc(*p, &target);
if (r < 0) {
log_unit_warning_errno(u, r, "readlink(\"%s\") failed, ignoring: %m", *p);
continue;
}
/* We don't treat this as an error, especially because we didn't check this for a
* long time. Nevertheless, we warn, because such mismatch can be mighty confusing. */
if (!unit_name_compatible(entry, basename(target)))
log_unit_warning(u, "%s dependency dropin %s target %s has different name",
unit_dependency_to_string(dependency), *p, target);
r = unit_add_dependency_by_name(u, dependency, entry, *p, true);
if (r < 0)
log_unit_error_errno(u, r, "cannot add %s dependency on %s, ignoring: %m",
unit_dependency_to_string(dependency), entry);
}
return 0;
}
int unit_load_dropin(Unit *u) {
_cleanup_strv_free_ char **l = NULL;
Iterator i;
char *t, **f;
char **f;
int r;
assert(u);
/* Load dependencies from supplementary drop-in directories */
/* Load dependencies from .wants and .requires directories */
r = process_deps(u, UNIT_WANTS, ".wants");
if (r < 0)
return r;
SET_FOREACH(t, u->names, i) {
char **p;
STRV_FOREACH(p, u->manager->lookup_paths.search_path) {
unit_file_process_dir(NULL, u->manager->unit_path_cache, *p, t,
".wants", UNIT_WANTS,
add_dependency_consumer, u, NULL);
unit_file_process_dir(NULL, u->manager->unit_path_cache, *p, t,
".requires", UNIT_REQUIRES,
add_dependency_consumer, u, NULL);
}
}
r = process_deps(u, UNIT_REQUIRES, ".requires");
if (r < 0)
return r;
/* Load .conf dropins */
r = unit_find_dropin_paths(u, &l);
if (r <= 0)
return 0;

10
src/core/load-dropin.h
View File

@ -25,11 +25,11 @@
/* Read service data supplementary drop-in directories */
static inline int unit_find_dropin_paths(Unit *u, char ***paths) {
return unit_file_find_dropin_paths(NULL,
u->manager->lookup_paths.search_path,
u->manager->unit_path_cache,
u->names,
paths);
return unit_file_find_dropin_conf_paths(NULL,
u->manager->lookup_paths.search_path,
u->manager->unit_path_cache,
u->names,
paths);
}
int unit_load_dropin(Unit *u);

88
src/shared/dropin.c
View File

@ -117,17 +117,12 @@ int write_drop_in_format(const char *dir, const char *unit, unsigned level,
return write_drop_in(dir, unit, level, name, p);
}
static int iterate_dir(
const char *path,
static int unit_file_find_dir(
const char *original_root,
UnitDependency dependency,
dependency_consumer_t consumer,
void *arg,
char ***strv) {
const char *path,
char ***dirs) {
_cleanup_free_ char *chased = NULL;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r;
assert(path);
@ -137,52 +132,21 @@ static int iterate_dir(
return log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING,
r, "Failed to canonicalize path %s: %m", path);
/* The config directories are special, since the order of the
* drop-ins matters */
if (dependency < 0) {
r = strv_push(strv, chased);
if (r < 0)
return log_oom();
chased = NULL;
return 0;
}
assert(consumer);
d = opendir(chased);
if (!d) {
if (errno == ENOENT)
return 0;
return log_warning_errno(errno, "Failed to open directory %s: %m", path);
}
FOREACH_DIRENT(de, d, return log_warning_errno(errno, "Failed to read directory %s: %m", path)) {
_cleanup_free_ char *f = NULL;
f = strjoin(path, "/", de->d_name);
if (!f)
return log_oom();
r = consumer(dependency, de->d_name, f, arg);
if (r < 0)
return r;
}
r = strv_push(dirs, chased);
if (r < 0)
return log_oom();
chased = NULL;
return 0;
}
int unit_file_process_dir(
static int unit_file_find_dirs(
const char *original_root,
Set *unit_path_cache,
const char *unit_path,
const char *name,
const char *suffix,
UnitDependency dependency,
dependency_consumer_t consumer,
void *arg,
char ***strv) {
char ***dirs) {
_cleanup_free_ char *path = NULL;
int r;
@ -195,8 +159,11 @@ int unit_file_process_dir(
if (!path)
return log_oom();
if (!unit_path_cache || set_get(unit_path_cache, path))
(void) iterate_dir(path, original_root, dependency, consumer, arg, strv);
if (!unit_path_cache || set_get(unit_path_cache, path)) {
r = unit_file_find_dir(original_root, path, dirs);
if (r < 0)
return r;
}
if (unit_name_is_valid(name, UNIT_NAME_INSTANCE)) {
_cleanup_free_ char *template = NULL, *p = NULL;
@ -210,8 +177,11 @@ int unit_file_process_dir(
if (!p)
return log_oom();
if (!unit_path_cache || set_get(unit_path_cache, p))
(void) iterate_dir(p, original_root, dependency, consumer, arg, strv);
if (!unit_path_cache || set_get(unit_path_cache, p)) {
r = unit_file_find_dir(original_root, p, dirs);
if (r < 0)
return r;
}
}
return 0;
@ -221,30 +191,28 @@ int unit_file_find_dropin_paths(
const char *original_root,
char **lookup_path,
Set *unit_path_cache,
const char *dir_suffix,
const char *file_suffix,
Set *names,
char ***paths) {
_cleanup_strv_free_ char **strv = NULL, **ans = NULL;
_cleanup_strv_free_ char **dirs = NULL, **ans = NULL;
Iterator i;
char *t;
char *t, **p;
int r;
assert(paths);
SET_FOREACH(t, names, i) {
char **p;
SET_FOREACH(t, names, i)
STRV_FOREACH(p, lookup_path)
unit_file_process_dir(original_root, unit_path_cache, *p, t, ".d",
_UNIT_DEPENDENCY_INVALID, NULL, NULL, &strv);
}
unit_file_find_dirs(original_root, unit_path_cache, *p, t, dir_suffix, &dirs);
if (strv_isempty(strv))
if (strv_isempty(dirs))
return 0;
r = conf_files_list_strv(&ans, ".conf", NULL, (const char**) strv);
r = conf_files_list_strv(&ans, file_suffix, NULL, (const char**) dirs);
if (r < 0)
return log_warning_errno(r, "Failed to get list of configuration files: %m");
return log_warning_errno(r, "Failed to sort the list of configuration files: %m");
*paths = ans;
ans = NULL;

37
src/shared/dropin.h
View File

@ -33,31 +33,24 @@ int write_drop_in(const char *dir, const char *unit, unsigned level,
int write_drop_in_format(const char *dir, const char *unit, unsigned level,
const char *name, const char *format, ...) _printf_(5, 6);
/**
* This callback will be called for each directory entry @entry,
* with @filepath being the full path to the entry.
*
* If return value is negative, loop will be aborted.
*/
typedef int (*dependency_consumer_t)(UnitDependency dependency,
const char *entry,
const char* filepath,
void *arg);
int unit_file_process_dir(
const char *original_root,
Set * unit_path_cache,
const char *unit_path,
const char *name,
const char *suffix,
UnitDependency dependency,
dependency_consumer_t consumer,
void *arg,
char ***strv);
int unit_file_find_dropin_paths(
const char *original_root,
char **lookup_path,
Set *unit_path_cache,
const char *dir_suffix,
const char *file_suffix,
Set *names,
char ***paths);
static inline int unit_file_find_dropin_conf_paths(
const char *original_root,
char **lookup_path,
Set *unit_path_cache,
Set *names,
char ***paths) {
return unit_file_find_dropin_paths(original_root,
lookup_path,
unit_path_cache,
".d", ".conf",
names, paths);
}

3
src/systemctl/systemctl.c
View File

@ -2601,7 +2601,8 @@ static int unit_find_paths(
return log_error_errno(r, "Failed to add unit name: %m");
if (dropin_paths) {
r = unit_file_find_dropin_paths(arg_root, lp->search_path, NULL, names, &dropins);
r = unit_file_find_dropin_conf_paths(arg_root, lp->search_path,
NULL, names, &dropins);
if (r < 0)
return r;
}

1
test/TEST-15-DROPIN/Makefile Symbolic link
View File

@ -0,0 +1 @@
../TEST-01-BASIC/Makefile

274
test/TEST-15-DROPIN/test-dropin.sh Executable file
View File

@ -0,0 +1,274 @@
#! /bin/bash
set -e
set -x
_clear_service () {
systemctl stop $1.service 2>/dev/null || :
rm -f /{etc,run,usr/lib}/systemd/system/$1.service
rm -fr /{etc,run,usr/lib}/systemd/system/$1.service.d
rm -fr /{etc,run,usr/lib}/systemd/system/$1.service.{wants,requires}
}
clear_services () {
for u in $*; do
_clear_service $u
done
systemctl daemon-reload
}
create_service () {
clear_services $1
cat >/etc/systemd/system/$1.service<<EOF
[Unit]
Description=$1 unit
[Service]
ExecStart=/bin/sleep 100000
EOF
mkdir -p /{etc,run,usr/lib}/systemd/system/$1.service.d
mkdir -p /etc/systemd/system/$1.service.{wants,requires}
mkdir -p /run/systemd/system/$1.service.{wants,requires}
mkdir -p /usr/lib/systemd/system/$1.service.{wants,requires}
}
create_services () {
for u in $*; do
create_service $u
done
}
check_ok () {
[ $# -eq 3 ] || return
x="$(systemctl show --value -p $2 $1)"
case "$x" in
*$3*) return 0 ;;
*) return 1
esac
}
check_ko () {
! check_ok "$@"
}
test_basic_dropins () {
echo "Testing basic dropins..."
echo "*** test a wants b wants c"
create_services a b c
ln -s ../b.service /etc/systemd/system/a.service.wants/
ln -s ../c.service /etc/systemd/system/b.service.wants/
check_ok a Wants b.service
check_ok b Wants c.service
echo "*** test a wants,requires b"
create_services a b c
ln -s ../b.service /etc/systemd/system/a.service.wants/
ln -s ../b.service /etc/systemd/system/a.service.requires/
check_ok a Wants b.service
check_ok a Requires b.service
echo "*** test a wants nonexistent"
create_service a
ln -s ../nonexistent.service /etc/systemd/system/a.service.wants/
check_ok a Wants nonexistent.service
systemctl start a
systemctl stop a
echo "*** test a requires nonexistent"
ln -sf ../nonexistent.service /etc/systemd/system/a.service.requires/
systemctl daemon-reload
check_ok a Requires nonexistent.service
# 'b' is already loaded when 'c' pulls it in via a dropin.
echo "*** test a,c require b"
create_services a b c
ln -sf ../b.service /etc/systemd/system/a.service.requires/
ln -sf ../b.service /etc/systemd/system/c.service.requires/
systemctl start a
check_ok c Requires b.service
systemctl stop a b
# 'b' is already loaded when 'c' pulls it in via an alias dropin.
echo "*** test a wants alias"
create_services a b c
ln -sf c.service /etc/systemd/system/c1.service
ln -sf ../c.service /etc/systemd/system/a.service.wants/
ln -sf ../c1.service /etc/systemd/system/b.service.wants/
systemctl start a
check_ok a Wants c.service
check_ok b Wants c.service
systemctl stop a c
clear_services a b c
}
test_template_dropins () {
echo "Testing template dropins..."
create_services foo bar@ yup@
ln -s /etc/systemd/system/bar@.service /etc/systemd/system/foo.service.wants/bar@1.service
check_ok foo Wants bar@1.service
clear_services foo bar@ yup@
}
test_alias_dropins () {
echo "Testing alias dropins..."
echo "*** test a wants b1 alias of b"
create_services a b
ln -sf b.service /etc/systemd/system/b1.service
ln -sf ../b1.service /etc/systemd/system/a.service.wants/
check_ok a Wants b.service
systemctl start a
systemctl --quiet is-active b
systemctl stop a b
rm /etc/systemd/system/b1.service
clear_services a b
# A weird behavior: the dependencies for 'a' may vary. It can be
# changed by loading an alias...
#
# [1] 'a1' is loaded and then "renamed" into 'a'. 'a1' is therefore
# part of the names set so all its specific dropins are loaded.
#
# [2] 'a' is already loaded. 'a1' is simply only merged into 'a' so
# none of its dropins are loaded ('y' is missing from the deps).
echo "*** test 2"
create_services a x y
mkdir -p /etc/systemd/system/a1.service.wants/
ln -sf a.service /etc/systemd/system/a1.service
ln -sf ../x.service /etc/systemd/system/a.service.wants/
ln -sf ../y.service /etc/systemd/system/a1.service.wants/
check_ok a1 Wants x.service # see [1]
check_ok a1 Wants y.service
systemctl start a
check_ok a1 Wants x.service # see [2]
check_ko a1 Wants y.service
systemctl stop a x y
rm /etc/systemd/system/a1.service
clear_services a x y
}
test_masked_dropins () {
echo "Testing masked dropins..."
create_services a b
# 'b' is masked for both deps
echo "*** test a wants,requires b is masked"
ln -sf /dev/null /etc/systemd/system/a.service.wants/b.service
ln -sf /dev/null /etc/systemd/system/a.service.requires/b.service
check_ko a Wants b.service
check_ko a Requires b.service
# 'a' wants 'b' and 'b' is masked at a lower level
echo "*** test a wants b, mask override"
ln -sf ../b.service /etc/systemd/system/a.service.wants/b.service
ln -sf /dev/null /usr/lib/systemd/system/a.service.wants/b.service
check_ok a Wants b.service
# 'a' wants 'b' and 'b' is masked at a higher level
echo "*** test a wants b, mask"
ln -sf /dev/null /etc/systemd/system/a.service.wants/b.service
ln -sf ../b.service /usr/lib/systemd/system/a.service.wants/b.service
check_ko a Wants b.service
# 'b1' is an alias for 'b': masking 'b' dep should not influence 'b1' dep
echo "*** test a wants b, b1, and one is masked"
create_services a b
ln -sf b.service /etc/systemd/system/b1.service
ln -sf /dev/null /etc/systemd/system/a.service.wants/b.service
ln -sf ../b1.service /usr/lib/systemd/system/a.service.wants/b1.service
systemctl cat a
systemctl show -p Wants,Requires a
systemctl cat b1
systemctl show -p Wants,Requires b1
check_ok a Wants b.service
check_ko a Wants b1.service # the alias does not show up in the list of units
rm /etc/systemd/system/b1.service
# 'b1' is an alias for 'b': masking 'b1' should not influence 'b' dep
echo "*** test a wants b, alias dep is masked"
create_services a b
ln -sf b.service /etc/systemd/system/b1.service
ln -sf /dev/null /etc/systemd/system/a.service.wants/b1.service
ln -sf ../b.service /usr/lib/systemd/system/a.service.wants/b.service
check_ok a Wants b.service
check_ko a Wants b1.service # the alias does not show up in the list of units
rm /etc/systemd/system/b1.service
# 'a' has Wants=b.service but also has a masking
# dropin 'b': 'b' should still be pulled in.
echo "*** test a wants b both ways"
create_services a b
ln -sf /dev/null /etc/systemd/system/a.service.wants/b.service
cat >/usr/lib/systemd/system/a.service.d/wants-b.conf<<EOF
[Unit]
Wants=b.service
EOF
check_ok a Wants b.service
# mask a dropin that points to an nonexistent unit.
echo "*** test a wants nonexistent is masked"
create_services a
ln -sf /dev/null /etc/systemd/system/a.service.requires/nonexistent.service
ln -sf ../nonexistent.service /usr/lib/systemd/system/a.service.requires/
check_ko a Requires nonexistent.service
# 'b' is already loaded when 'c' pulls it in via a dropin but 'b' is
# masked at a higher level.
echo "*** test a wants b is masked"
create_services a b c
ln -sf ../b.service /etc/systemd/system/a.service.requires/
ln -sf ../b.service /run/systemd/system/c.service.requires/
ln -sf /dev/null /etc/systemd/system/c.service.requires/b.service
systemctl start a
check_ko c Requires b.service
systemctl stop a b
# 'b' is already loaded when 'c' pulls it in via a dropin but 'b' is
# masked at a lower level.
echo "*** test a requires b is masked"
create_services a b c
ln -sf ../b.service /etc/systemd/system/a.service.requires/
ln -sf ../b.service /etc/systemd/system/c.service.requires/
ln -sf /dev/null /run/systemd/system/c.service.requires/b.service
systemctl start a
check_ok c Requires b.service
systemctl stop a b
# 'a' requires 2 aliases of 'b' and one of them is a mask.
echo "*** test a requires alias of b, other alias masked"
create_services a b
ln -sf b.service /etc/systemd/system/b1.service
ln -sf b.service /etc/systemd/system/b2.service
ln -sf /dev/null /etc/systemd/system/a.service.requires/b1.service
ln -sf ../b1.service /run/systemd/system/a.service.requires/
ln -sf ../b2.service /usr/lib/systemd/system/a.service.requires/
check_ok a Requires b
# Same as above but now 'b' is masked.
echo "*** test a requires alias of b, b dep masked"
create_services a b
ln -sf b.service /etc/systemd/system/b1.service
ln -sf b.service /etc/systemd/system/b2.service
ln -sf ../b1.service /run/systemd/system/a.service.requires/
ln -sf ../b2.service /usr/lib/systemd/system/a.service.requires/
ln -sf /dev/null /etc/systemd/system/a.service.requires/b.service
check_ok a Requires b
clear_services a b
}
test_basic_dropins
test_template_dropins
test_alias_dropins
test_masked_dropins
touch /testok

46
test/TEST-15-DROPIN/test.sh Executable file
View File

@ -0,0 +1,46 @@
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
TEST_DESCRIPTION="Dropin tests"
. $TEST_BASE_DIR/test-functions
test_run_nspawn() {
if ! run_nspawn; then
dwarn "can't run systemd-nspawn, skipping"
return 0
fi
check_result_nspawn
}
test_run() {
test_run_nspawn || return
}
test_setup() {
# create the basic filesystem layout
setup_basic_environment >/dev/null
# mask some services that we do not want to run in these tests
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
# import the test scripts in the rootfs and plug them in systemd
cp testsuite.service $initdir/etc/systemd/system/
cp test-dropin.sh $initdir/
setup_testsuite
# create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
setup_nspawn_root
}
test_cleanup() {
return 0
}
do_test "$@"

7
test/TEST-15-DROPIN/testsuite.service Normal file
View File

@ -0,0 +1,7 @@
[Unit]
Description=Testsuite service
After=multi-user.target
[Service]
ExecStart=/test-dropin.sh
Type=oneshot