X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcondition.c;h=2b51a16f17548e48500a460e533e4dee1de1b1b9;hp=3ab4d4e225e6840af5ddc3fa91b215ec30cfc436;hb=b3fa47e0819b08ea32e69e19e6d88ce2daca069d;hpb=039655a40c77f88e4f9ccc00824f2f483f22f2c1 diff --git a/src/condition.c b/src/condition.c index 3ab4d4e22..2b51a16f1 100644 --- a/src/condition.c +++ b/src/condition.c @@ -23,22 +23,36 @@ #include #include #include +#include + +#ifdef HAVE_SELINUX +#include +#endif #include "util.h" #include "condition.h" +#include "virt.h" -Condition* condition_new(ConditionType type, const char *parameter, bool negate) { +Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) { Condition *c; + assert(type < _CONDITION_TYPE_MAX); + c = new0(Condition, 1); + if (!c) + return NULL; + c->type = type; + c->trigger = trigger; c->negate = negate; - if (parameter) - if (!(c->parameter = strdup(parameter))) { + if (parameter) { + c->parameter = strdup(parameter); + if (!c->parameter) { free(c); return NULL; } + } return c; } @@ -66,7 +80,11 @@ static bool test_kernel_command_line(const char *parameter) { assert(parameter); - if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) { + if (detect_container(NULL) > 0) + return false; + + r = read_one_line_file("/proc/cmdline", &line); + if (r < 0) { log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); return false; } @@ -77,7 +95,8 @@ static bool test_kernel_command_line(const char *parameter) { FOREACH_WORD_QUOTED(w, l, line, state) { free(word); - if (!(word = strndup(w, l))) + word = strndup(w, l); + if (!word) break; if (equal) { @@ -101,25 +120,76 @@ static bool test_kernel_command_line(const char *parameter) { } static bool test_virtualization(const char *parameter) { - int r, b; + int b; + Virtualization v; const char *id; assert(parameter); - if ((r = detect_virtualization(&id)) < 0) { - log_warning("Failed to detect virtualization, ignoring: %s", strerror(-r)); + v = detect_virtualization(&id); + if (v < 0) { + log_warning("Failed to detect virtualization, ignoring: %s", strerror(-v)); return false; } + /* First, compare with yes/no */ b = parse_boolean(parameter); - if (r > 0 && b > 0) + if (v > 0 && b > 0) return true; - if (r == 0 && b == 0) + if (v == 0 && b == 0) return true; - return streq(parameter, id); + /* Then, compare categorization */ + if (v == VIRTUALIZATION_VM && streq(parameter, "vm")) + return true; + + if (v == VIRTUALIZATION_CONTAINER && streq(parameter, "container")) + return true; + + /* Finally compare id */ + return v > 0 && streq(parameter, id); +} + +static bool test_security(const char *parameter) { +#ifdef HAVE_SELINUX + if (streq(parameter, "selinux")) + return is_selinux_enabled() > 0; +#endif + return false; +} + +static bool test_capability(const char *parameter) { + cap_value_t value; + FILE *f; + char line[LINE_MAX]; + unsigned long long capabilities = (unsigned long long) -1; + + /* If it's an invalid capability, we don't have it */ + + if (cap_from_name(parameter, &value) < 0) + return false; + + /* If it's a valid capability we default to assume + * that we have it */ + + f = fopen("/proc/self/status", "re"); + if (!f) + return true; + + while (fgets(line, sizeof(line), f)) { + truncate_nl(line); + + if (startswith(line, "CapBnd:")) { + (void) sscanf(line+7, "%llx", &capabilities); + break; + } + } + + fclose(f); + + return !!(capabilities & (1ULL << value)); } bool condition_test(Condition *c) { @@ -130,6 +200,28 @@ bool condition_test(Condition *c) { case CONDITION_PATH_EXISTS: return (access(c->parameter, F_OK) >= 0) == !c->negate; + case CONDITION_PATH_EXISTS_GLOB: + return (glob_exists(c->parameter) > 0) == !c->negate; + + case CONDITION_PATH_IS_DIRECTORY: { + struct stat st; + + if (stat(c->parameter, &st) < 0) + return c->negate; + return S_ISDIR(st.st_mode) == !c->negate; + } + + case CONDITION_PATH_IS_SYMBOLIC_LINK: { + struct stat st; + + if (lstat(c->parameter, &st) < 0) + return c->negate; + return S_ISLNK(st.st_mode) == !c->negate; + } + + case CONDITION_PATH_IS_MOUNT_POINT: + return (path_is_mount_point(c->parameter, true) > 0) == !c->negate; + case CONDITION_DIRECTORY_NOT_EMPTY: { int k; @@ -137,11 +229,26 @@ bool condition_test(Condition *c) { return !(k == -ENOENT || k > 0) == !c->negate; } + case CONDITION_FILE_IS_EXECUTABLE: { + struct stat st; + + if (stat(c->parameter, &st) < 0) + return c->negate; + + return (S_ISREG(st.st_mode) && (st.st_mode & 0111)) == !c->negate; + } + case CONDITION_KERNEL_COMMAND_LINE: - return !!test_kernel_command_line(c->parameter) == !c->negate; + return test_kernel_command_line(c->parameter) == !c->negate; case CONDITION_VIRTUALIZATION: - return !!test_virtualization(c->parameter) == !c->negate; + return test_virtualization(c->parameter) == !c->negate; + + case CONDITION_SECURITY: + return test_security(c->parameter) == !c->negate; + + case CONDITION_CAPABILITY: + return test_capability(c->parameter) == !c->negate; case CONDITION_NULL: return !c->negate; @@ -153,17 +260,28 @@ bool condition_test(Condition *c) { bool condition_test_list(Condition *first) { Condition *c; + int triggered = -1; /* If the condition list is empty, then it is true */ if (!first) return true; - /* Otherwise, if any of the conditions apply we return true */ - LIST_FOREACH(conditions, c, first) - if (condition_test(c)) - return true; + /* Otherwise, if all of the non-trigger conditions apply and + * if any of the trigger conditions apply (unless there are + * none) we return true */ + LIST_FOREACH(conditions, c, first) { + bool b; - return false; + b = condition_test(c); + + if (!c->trigger && !b) + return false; + + if (c->trigger && triggered <= 0) + triggered = b; + } + + return triggered != 0; } void condition_dump(Condition *c, FILE *f, const char *prefix) { @@ -174,9 +292,10 @@ void condition_dump(Condition *c, FILE *f, const char *prefix) { prefix = ""; fprintf(f, - "%s%s: %s%s\n", + "%s\t%s: %s%s%s\n", prefix, condition_type_to_string(c->type), + c->trigger ? "|" : "", c->negate ? "!" : "", c->parameter); } @@ -189,8 +308,15 @@ void condition_dump_list(Condition *first, FILE *f, const char *prefix) { } static const char* const condition_type_table[_CONDITION_TYPE_MAX] = { - [CONDITION_KERNEL_COMMAND_LINE] = "ConditionKernelCommandLine", [CONDITION_PATH_EXISTS] = "ConditionPathExists", + [CONDITION_PATH_EXISTS_GLOB] = "ConditionPathExistsGlob", + [CONDITION_PATH_IS_DIRECTORY] = "ConditionPathIsDirectory", + [CONDITION_PATH_IS_SYMBOLIC_LINK] = "ConditionPathIsSymbolicLink", + [CONDITION_PATH_IS_MOUNT_POINT] = "ConditionPathIsMountPoint", + [CONDITION_DIRECTORY_NOT_EMPTY] = "ConditionDirectoryNotEmpty", + [CONDITION_KERNEL_COMMAND_LINE] = "ConditionKernelCommandLine", + [CONDITION_VIRTUALIZATION] = "ConditionVirtualization", + [CONDITION_SECURITY] = "ConditionSecurity", [CONDITION_NULL] = "ConditionNull" };