Merge pull request #139 from jhunkeler/bughunt-1002HEAD1.6.1master

Bughunt 0x1002

1 files changed, 77 insertions, 14 deletions

diff --git a/src/cli/stasis/system_requirements.c b/src/cli/stasis/system_requirements.c
index 02889da..a48c113 100644
--- a/src/cli/stasis/system_requirements.c
+++ b/src/cli/stasis/system_requirements.c
@@ -3,20 +3,83 @@
 void check_system_env_requirements() {
     msg(STASIS_MSG_L1, "Checking environment\n");
     globals.envctl = envctl_init();
-    envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "TMPDIR");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_ROOT");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_SYSCONFDIR");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_CPU_COUNT");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REQUIRED | STASIS_ENVCTL_REDACT, callback_except_gh, "STASIS_GH_TOKEN");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REQUIRED, callback_except_jf, "STASIS_JF_ARTIFACTORY_URL");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_ACCESS_TOKEN");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_JF_USER");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_PASSWORD");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_SSH_KEY_PATH");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_SSH_PASSPHRASE");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_CLIENT_CERT_CERT_PATH");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_CLIENT_CERT_KEY_PATH");
-    envctl_register(&globals.envctl, STASIS_ENVCTL_REQUIRED, callback_except_jf, "STASIS_JF_REPO");
+    if (!globals.envctl) {
+        SYSERROR("envctl_init failed");
+        exit(1);
+    }
+
+    int status = 0;
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "TMPDIR");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_ROOT");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_SYSCONFDIR");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_CPU_COUNT");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REQUIRED | STASIS_ENVCTL_REDACT, callback_except_gh, "STASIS_GH_TOKEN");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REQUIRED, callback_except_jf, "STASIS_JF_ARTIFACTORY_URL");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_ACCESS_TOKEN");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_PASSTHRU, NULL, "STASIS_JF_USER");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_PASSWORD");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_SSH_KEY_PATH");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_SSH_PASSPHRASE");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_CLIENT_CERT_CERT_PATH");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REDACT, NULL, "STASIS_JF_CLIENT_CERT_KEY_PATH");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+    status = envctl_register(&globals.envctl, STASIS_ENVCTL_REQUIRED, callback_except_jf, "STASIS_JF_REPO");
+    if (status) {
+        SYSERROR("envctl_register failed");
+        exit(1);
+    }
+
     envctl_do_required(globals.envctl, globals.verbose);
 }