fix: Fail if RMT_PASSWORD is unset

When RMT_PASSWORD wasn't set, openssl was waiting for the argument, This could cause the Docker container to hang up.
DSD-DBS · Sep 19, 2023 · 2ebcd85 · 2ebcd85
1 parent df34601
commit 2ebcd85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/readonly/startup.sh b/readonly/startup.sh
@@ -3,9 +3,10 @@
 # SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
 # SPDX-License-Identifier: Apache-2.0
 
-set -ex
+set -exuo pipefail
+
 line=$(grep techuser /etc/shadow);
-echo ${line%%:*}:$(openssl passwd -6 -salt $(openssl rand -base64 16) $RMT_PASSWORD):${line#*:*:} > /etc/shadow;
+echo ${line%%:*}:$(openssl passwd -6 -salt $(openssl rand -base64 16) "${RMT_PASSWORD:?}"):${line#*:*:} > /etc/shadow;
 unset RMT_PASSWORD
 
 # Prepare Workspace

diff --git a/remote/startup.sh b/remote/startup.sh
@@ -3,11 +3,12 @@
 # SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
 # SPDX-License-Identifier: Apache-2.0
 
-set -e
+set -exuo pipefail
+
 if [ "$(whoami)" == "root" ] || [ "$(whoami)" == "techuser" ];
 then
     line=$(grep techuser /etc/shadow);
-    echo ${line%%:*}:$(openssl passwd -6 -salt $(openssl rand -base64 16) $RMT_PASSWORD):${line#*:*:} > /etc/shadow;
+    echo ${line%%:*}:$(openssl passwd -6 -salt $(openssl rand -base64 16) "${RMT_PASSWORD:?}"):${line#*:*:} > /etc/shadow;
 else
     echo "Only techuser and root are supported as users.";
     exit 1;