diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | src/core/execute.c | 2 | ||||
| -rw-r--r-- | src/core/namespace.c | 15 | ||||
| -rw-r--r-- | src/core/namespace.h | 5 | ||||
| -rw-r--r-- | src/test/test-namespace.c | 56 |
5 files changed, 77 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 73709793a5..d8670786ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1105,6 +1105,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-namespace \ test-date \ test-sleep \ test-replace-var \ @@ -1225,6 +1226,12 @@ test_util_SOURCES = \ test_util_LDADD = \ libsystemd-core.la +test_namespace_SOURCES = \ + src/test/test-namespace.c + +test_namespace_LDADD = \ + libsystemd-core.la + test_hashmap_SOURCES = \ src/test/test-hashmap.c diff --git a/src/core/execute.c b/src/core/execute.c index 8f09233e3e..e04f46f036 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1089,7 +1089,7 @@ int exec_spawn(ExecCommand *command, free(line); if (context->private_tmp && !context->tmp_dir && !context->var_tmp_dir) { - r = setup_tmpdirs(&context->tmp_dir, &context->var_tmp_dir); + r = setup_tmpdirs(unit_id, &context->tmp_dir, &context->var_tmp_dir); if (r < 0) return r; } diff --git a/src/core/namespace.c b/src/core/namespace.c index 936f36839b..b453f8dc09 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -184,26 +184,29 @@ static int make_read_only(BindMount *m) { return 0; } -int setup_tmpdirs(char **tmp_dir, +int setup_tmpdirs(const char *unit_id, + char **tmp_dir, char **var_tmp_dir) { int r = 0; - char tmp_dir_template[] = "/tmp/systemd-private-XXXXXX", - var_tmp_dir_template[] = "/var/tmp/systemd-private-XXXXXX"; + _cleanup_free_ char *tmp = NULL, *var = NULL; assert(tmp_dir); assert(var_tmp_dir); - r = create_tmp_dir(tmp_dir_template, tmp_dir); + tmp = strjoin("/tmp/systemd-", unit_id, "-XXXXXXX", NULL); + var = strjoin("/var/tmp/systemd-", unit_id, "-XXXXXXX", NULL); + + r = create_tmp_dir(tmp, tmp_dir); if (r < 0) return r; - r = create_tmp_dir(var_tmp_dir_template, var_tmp_dir); + r = create_tmp_dir(var, var_tmp_dir); if (r == 0) return 0; /* failure */ rmdir(*tmp_dir); - rmdir(tmp_dir_template); + rmdir(tmp); free(*tmp_dir); *tmp_dir = NULL; diff --git a/src/core/namespace.h b/src/core/namespace.h index ddb579468d..ee7416b7bd 100644 --- a/src/core/namespace.h +++ b/src/core/namespace.h @@ -23,7 +23,10 @@ #include <stdbool.h> -int setup_tmpdirs(char **tmp_dir, char **var_tmp_dir); +int setup_tmpdirs(const char *unit_id, + char **tmp_dir, + char **var_tmp_dir); + int setup_namespace(char **read_write_dirs, char **read_only_dirs, char **inaccessible_dirs, diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c new file mode 100644 index 0000000000..1c04676cc4 --- /dev/null +++ b/src/test/test-namespace.c @@ -0,0 +1,56 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2013 Zbigniew Jędrzejewski-Szmek + + 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/>. +***/ + +#include <libgen.h> + +#include "namespace.h" +#include "util.h" + +static void test_tmpdir(const char *id, const char *A, const char *B) { + _cleanup_free_ char *a, *b; + + assert_se(setup_tmpdirs(id, &a, &b) == 0); + assert(startswith(a, A)); + assert(startswith(b, B)); + assert(access(a, F_OK) == 0); + assert(access(b, F_OK) == 0); + + assert_se(rmdir(a) == 0); + assert_se(rmdir(b) == 0); + + assert(endswith(a, "/tmp")); + assert(endswith(b, "/tmp")); + + assert_se(rmdir(dirname(a)) == 0); + assert_se(rmdir(dirname(b)) == 0); +} + +int main(int argc, char *argv[]) { + test_tmpdir("abcd.service", + "/tmp/systemd-abcd.service-", + "/var/tmp/systemd-abcd.service-"); + + test_tmpdir("sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device", + "/tmp/systemd-sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device-", + "/var/tmp/systemd-sys-devices-pci0000:00-0000:00:1a.0-usb3-3\\x2d1-3\\x2d1:1.0-bluetooth-hci0.device-"); + + return 0; +} |