chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conf-parser: distinguish between multiple sections with the same name
[elogind.git]
/
src
/
core
/
condition.c
diff --git
a/src/core/condition.c
b/src/core/condition.c
index b2617ef5bfe2f9c9678dcd51d1708e690974002c..436e7840d0e63a35883d9195565183a4bde384d6 100644
(file)
--- a/
src/core/condition.c
+++ b/
src/core/condition.c
@@
-27,16
+27,17
@@
#include <sys/statvfs.h>
#include <fnmatch.h>
#include <sys/statvfs.h>
#include <fnmatch.h>
-#ifdef HAVE_SELINUX
-#include <selinux/selinux.h>
-#endif
-
#include <systemd/sd-id128.h>
#include "util.h"
#include "condition.h"
#include "virt.h"
#include "path-util.h"
#include "fileio.h"
#include <systemd/sd-id128.h>
#include "util.h"
#include "condition.h"
#include "virt.h"
#include "path-util.h"
#include "fileio.h"
+#include "unit.h"
+#include "smack-util.h"
+#include "apparmor-util.h"
+#include "ima-util.h"
+#include "selinux-util.h"
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
Condition *c;
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
Condition *c;
@@
-85,14
+86,11
@@
static bool test_kernel_command_line(const char *parameter) {
assert(parameter);
assert(parameter);
- if (detect_container(NULL) > 0)
- return false;
-
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
+ r = proc_cmdline(&line);
+ if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return false;
return false;
- }
equal = !!strchr(parameter, '=');
pl = strlen(parameter);
equal = !!strchr(parameter, '=');
pl = strlen(parameter);
@@
-157,28
+155,15
@@
static bool test_virtualization(const char *parameter) {
return v > 0 && streq(parameter, id);
}
return v > 0 && streq(parameter, id);
}
-static bool test_apparmor_enabled(void) {
- int r;
- _cleanup_free_ char *p = NULL;
-
- r = read_one_line_file("/sys/module/apparmor/parameters/enabled", &p);
- if (r < 0)
- return false;
-
- return parse_boolean(p) > 0;
-}
-
static bool test_security(const char *parameter) {
static bool test_security(const char *parameter) {
-#ifdef HAVE_SELINUX
if (streq(parameter, "selinux"))
if (streq(parameter, "selinux"))
- return is_selinux_enabled() > 0;
-#endif
+ return use_selinux();
if (streq(parameter, "apparmor"))
if (streq(parameter, "apparmor"))
- return
test_apparmor_enabled
();
+ return
use_apparmor
();
if (streq(parameter, "ima"))
if (streq(parameter, "ima"))
- return
access("/sys/kernel/security/ima/", F_OK) == 0
;
+ return
use_ima()
;
if (streq(parameter, "smack"))
if (streq(parameter, "smack"))
- return
access("/sys/fs/smackfs", F_OK) == 0
;
+ return
use_smack()
;
return false;
}
return false;
}
@@
-249,7
+234,7
@@
static bool test_ac_power(const char *parameter) {
return (on_ac_power() != 0) == !!r;
}
return (on_ac_power() != 0) == !!r;
}
-bool condition_test(Condition *c) {
+
static
bool condition_test(Condition *c) {
assert(c);
switch(c->type) {
assert(c);
switch(c->type) {
@@
-333,7
+318,7
@@
bool condition_test(Condition *c) {
}
}
}
}
-bool condition_test_list(Condition *first) {
+bool condition_test_list(
const char *unit,
Condition *first) {
Condition *c;
int triggered = -1;
Condition *c;
int triggered = -1;
@@
-348,6
+333,16
@@
bool condition_test_list(Condition *first) {
bool b;
b = condition_test(c);
bool b;
b = condition_test(c);
+ if (unit)
+ log_debug_unit(unit,
+ "%s=%s%s%s %s for %s.",
+ condition_type_to_string(c->type),
+ c->trigger ? "|" : "",
+ c->negate ? "!" : "",
+ c->parameter,
+ b ? "succeeded" : "failed",
+ unit);
+ c->state = b ? 1 : -1;
if (!c->trigger && !b)
return false;
if (!c->trigger && !b)
return false;
@@
-367,12
+362,13
@@
void condition_dump(Condition *c, FILE *f, const char *prefix) {
prefix = "";
fprintf(f,
prefix = "";
fprintf(f,
- "%s\t%s: %s%s%s\n",
+ "%s\t%s: %s%s%s
%s
\n",
prefix,
condition_type_to_string(c->type),
c->trigger ? "|" : "",
c->negate ? "!" : "",
prefix,
condition_type_to_string(c->type),
c->trigger ? "|" : "",
c->negate ? "!" : "",
- c->parameter);
+ c->parameter,
+ c->state < 0 ? "failed" : c->state > 0 ? "succeeded" : "untested");
}
void condition_dump_list(Condition *first, FILE *f, const char *prefix) {
}
void condition_dump_list(Condition *first, FILE *f, const char *prefix) {
@@
-391,9
+387,11
@@
static const char* const condition_type_table[_CONDITION_TYPE_MAX] = {
[CONDITION_PATH_IS_READ_WRITE] = "ConditionPathIsReadWrite",
[CONDITION_DIRECTORY_NOT_EMPTY] = "ConditionDirectoryNotEmpty",
[CONDITION_FILE_NOT_EMPTY] = "ConditionFileNotEmpty",
[CONDITION_PATH_IS_READ_WRITE] = "ConditionPathIsReadWrite",
[CONDITION_DIRECTORY_NOT_EMPTY] = "ConditionDirectoryNotEmpty",
[CONDITION_FILE_NOT_EMPTY] = "ConditionFileNotEmpty",
+ [CONDITION_FILE_IS_EXECUTABLE] = "ConditionFileIsExecutable",
[CONDITION_KERNEL_COMMAND_LINE] = "ConditionKernelCommandLine",
[CONDITION_VIRTUALIZATION] = "ConditionVirtualization",
[CONDITION_SECURITY] = "ConditionSecurity",
[CONDITION_KERNEL_COMMAND_LINE] = "ConditionKernelCommandLine",
[CONDITION_VIRTUALIZATION] = "ConditionVirtualization",
[CONDITION_SECURITY] = "ConditionSecurity",
+ [CONDITION_CAPABILITY] = "ConditionCapability",
[CONDITION_HOST] = "ConditionHost",
[CONDITION_AC_POWER] = "ConditionACPower",
[CONDITION_NULL] = "ConditionNull"
[CONDITION_HOST] = "ConditionHost",
[CONDITION_AC_POWER] = "ConditionACPower",
[CONDITION_NULL] = "ConditionNull"