diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2018-06-17 20:31:16 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2018-06-17 20:31:16 +0200 |
| commit | b17a36a17abc0ec5e6466d0af4f33109d4ef169b (patch) | |
| tree | bd862904d724b6220cfd559ce14a8869afa14853 | |
| parent | 7c38b9781f60e4a5ae46092783a71a132506a5aa (diff) | |
added --test to test essential app functions (more in future) during startup/gitlab
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/options.c | 3 | ||||
| -rw-r--r-- | src/options.h | 1 | ||||
| -rw-r--r-- | src/utils.c | 18 | ||||
| -rw-r--r-- | src/utils.h | 2 |
6 files changed, 26 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93c2add..e76d760 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build - - sast + - test + - analysis build-debian: image: debian:stable @@ -9,6 +10,7 @@ build-debian: - ./autogen.sh - ./configure - make + - valgrind --error-exitcode=1 ./src/potd --test --redirect 127.0.0.1:2222:127.0.0.1:22222 --protocol 127.0.0.1:22222:127.0.0.1:33333 --jail 127.0.0.1:33333 stage: build artifacts: paths: @@ -22,7 +24,8 @@ build-arch: - ./autogen.sh - ./configure - make - stage: build + - valgrind --error-exitcode=1 ./src/potd --test --redirect 127.0.0.1:2222:127.0.0.1:22222 --protocol 127.0.0.1:22222:127.0.0.1:33333 --jail 127.0.0.1:33333 + stage: test artifacts: paths: - ./src/potd @@ -38,7 +41,7 @@ sast: allow_failure: true services: - docker:stable-dind - stage: build + stage: analysis script: - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - docker run @@ -309,7 +309,7 @@ int main(int argc, char *argv[]) LOG_SET_FUNCS_VA(LOG_COLORED_FUNCS); } - ABORT_ON_FATAL( selfcheck_minimal_requirements(), + ABORT_ON_FATAL( selftest_minimal_requirements(), "Selfcheck" ); if (getopt_used(OPT_LOGLEVEL)) { diff --git a/src/options.c b/src/options.c index ef05fc8..797dc88 100644 --- a/src/options.c +++ b/src/options.c @@ -87,7 +87,8 @@ static struct opt options[OPT_MAX+1] = { "use a minimal set of blocked syscalls e.g.\n" "mount, umount, ptrace, kernel module syscalls\n" "and some io syscalls\n" - "(use this if you acknowledge errors on some platforms)\n"), + "(use this if you acknowledge errors on some platforms e.g. OpenWrt)\n"), + OPT_NOARG("test", "test essential daemon functions and exit\n", NULL), OPT_NOARG("help", "this\n", NULL), OPT(OT_INVALID, .ll = 0, NULL, NULL, NULL) diff --git a/src/options.h b/src/options.h index 4c81c11..f9d96c2 100644 --- a/src/options.h +++ b/src/options.h @@ -12,6 +12,7 @@ typedef enum opt_name { OPT_ROOT, OPT_NETNS_RUN_DIR, OPT_SECCOMP_MINIMAL, + OPT_RUNTEST, OPT_HELP, OPT_MAX diff --git a/src/utils.c b/src/utils.c index 69d7b81..dd7657c 100644 --- a/src/utils.c +++ b/src/utils.c @@ -883,19 +883,31 @@ size_t parse_hostport_str(const char *str, char hbuf[NI_MAXHOST], return siz; } -int selfcheck_minimal_requirements(void) +int selftest_minimal_requirements(void) { int s; char buf[32] = {0}; char test[64] = {0}; + N2("%s", "Selftest .."); + memset(&test[0], 'A', sizeof test); test[sizeof test - 1] = 0; s = snprintf(buf, sizeof buf, "%s", &test[0]); if (s != sizeof test - 1) - return 1; + goto error; if (buf[sizeof buf - 1] != 0) - return 1; + goto error; + if (getopt_used(OPT_RUNTEST)) { + N("%s", "Selftest success"); + exit(EXIT_SUCCESS); + } return 0; +error: + if (getopt_used(OPT_RUNTEST)) { + E("%s", "Selftest failed"); + exit(EXIT_FAILURE); + } + return 1; } diff --git a/src/utils.h b/src/utils.h index 8634b01..8e2ee7d 100644 --- a/src/utils.h +++ b/src/utils.h @@ -74,6 +74,6 @@ size_t parse_hostport(const char *str, const char *result[2], size_t parse_hostport_str(const char *str, char hbuf[NI_MAXHOST], char sbuf[NI_MAXSERV]); -int selfcheck_minimal_requirements(void); +int selftest_minimal_requirements(void); #endif |