store exactly one set of basic auth credentials per component

README.md

@@ -359,7 +359,7 @@ https://<Name of your server>/bbmri-localdatamanagement/fhir
 ```
 The name of your server will generally be the full name of the VM that the Bridgehead runs on. You can alternatively supply an IP address.
 
-The FHIR API uses basic auth. You can find the credentials in `/etc/bridgehead/<project>.local.conf`.
+The FHIR API uses basic auth. You can find the credentials in `/etc/bridgehead/<project>.local.conf`. Exactly one set of credentials is supported, so `bridgehead setuser <project>` replaces the previous ones.
 
 Note that if you don't have a DNS certificate for the Bridgehead, you will need to allow an insecure connection. E.g. with curl, use the `-k` flag.
 

bridgehead

@@ -169,13 +169,21 @@ case "$ACTION" in
 	uninstall)
 		exec ./lib/uninstall-bridgehead.sh $PROJECT
 		;;
-	adduser)
+	setuser)
 		loadVars
-		log "INFO" "Adding encrypted credentials in /etc/bridgehead/$PROJECT.local.conf"
+		log "INFO" "Setting encrypted credentials in /etc/bridgehead/$PROJECT.local.conf"
-    		read -p "Please choose the component (LDM_AUTH|NNGM_AUTH|EXPORTER_USER) you want to add a user to : " COMPONENT
+		read -p "Please choose the component ($(echo $BASIC_AUTH_VARIABLES | tr ' ' '|')) you want to set the credentials for : " COMPONENT
-    		read -p "Please enter a username: " USER
+		case " $BASIC_AUTH_VARIABLES " in
-    		read -s -p "Please enter a password (will not be echoed): "$'\n' PASSWORD
+			*" $COMPONENT "*)
-    		add_basic_auth_user $USER $PASSWORD $COMPONENT $PROJECT
+				;;
+			*)
+				log "ERROR" "\"$COMPONENT\" is not a basic auth component. Choose one of: $BASIC_AUTH_VARIABLES"
+				exit 1
+				;;
+		esac
+		read -p "Please enter a username: " USER
+		read -s -p "Please enter a password (will not be echoed): "$'\n' PASSWORD
+		set_basic_auth_user "$USER" "$PASSWORD" "$COMPONENT" "$PROJECT"
 		;;
 	enroll)
 		loadVars

lib/functions.sh

@@ -53,7 +53,7 @@ checkOwner(){
 }
 
 printUsage() {
-	echo "Usage: bridgehead start|stop|logs|docker-logs|is-running|update|check|install|uninstall|adduser|enroll PROJECTNAME"
+	echo "Usage: bridgehead start|stop|logs|docker-logs|is-running|update|check|install|uninstall|setuser|enroll PROJECTNAME"
 	echo "PROJECTNAME should be one of ccp|bbmri|cce|itcc|kr|dhki|nngm"
 }
 
@@ -247,21 +247,55 @@ function do_enroll {
 	do_enroll_inner $@
 }
 
-add_basic_auth_user() {
+BASIC_AUTH_VARIABLES="LDM_AUTH NNGM_AUTH TRANSFAIR_AUTH EXPORTER_USER"
-   USER="${1}"
+
-   PASSWORD="${2}"
+# One entry of Traefik's basicauth.users list: "user:hash", with the username
-   NAME="${3}"
+# restricted to characters that cannot collide with either separator.
-   PROJECT="${4}"
+is_valid_basic_auth_entry() {
-   FILE="/etc/bridgehead/${PROJECT}.local.conf"
+	local entry="$1"
-   ENCRY_CREDENTIALS="$(docker run --rm docker.verbis.dkfz.de/cache/httpd:alpine htpasswd -nb $USER $PASSWORD  | tr -d '\n' | tr -d '\r')"
+	local user="${entry%%:*}"
-   if [ -f $FILE ] && grep -R -q "$NAME=" $FILE # if a specific basic auth user already exists:
+	local hash="${entry#*:}"
-   then
+	[ "$user" != "$entry" ] || return 1
-     sed -i "/$NAME/ s|='|='$ENCRY_CREDENTIALS,|" $FILE
+	[ -n "$hash" ] || return 1
-   else
+	[ "$hash" = "${hash#*:}" ] || return 1
-     echo -e "\n## Basic Authentication Credentials for:\n$NAME='$ENCRY_CREDENTIALS'" >> $FILE;
+	[[ "$user" =~ ^[A-Za-z0-9._-]+$ ]]
-   fi
+}
- 	log DEBUG "Saving clear text credentials in $FILE. If wanted, delete them manually."
+
-   sed -i "/^$NAME/ s|$|\n# User: $USER\n# Password: $PASSWORD|" $FILE
+# Stores one set of basic auth credentials in $NAME, replacing any existing ones.
+set_basic_auth_user() {
+	local USER="${1}"
+	local PASSWORD="${2}"
+	local NAME="${3}"
+	local PROJECT="${4}"
+	local FILE="/etc/bridgehead/${PROJECT}.local.conf"
+	local ENCRY_CREDENTIALS
+	if [ -z "$USER" ] || [ -z "$PASSWORD" ]; then
+		log ERROR "Both a username and a password are required. $FILE is unchanged."
+		return 1
+	fi
+	if ! ENCRY_CREDENTIALS="$(docker run --rm docker.verbis.dkfz.de/cache/httpd:alpine htpasswd -nb "$USER" "$PASSWORD")"; then
+		log ERROR "Unable to run htpasswd, so no credentials were generated. $FILE is unchanged."
+		return 1
+	fi
+	ENCRY_CREDENTIALS="$(printf '%s' "$ENCRY_CREDENTIALS" | tr -d '\n' | tr -d '\r')"
+	if ! is_valid_basic_auth_entry "$ENCRY_CREDENTIALS"; then
+		log ERROR "htpasswd returned no usable credentials for \"$USER\". $FILE is unchanged."
+		return 1
+	fi
+	if [ -f $FILE ] && grep -q "^$NAME=" $FILE # if this basic auth variable already exists:
+	then
+		sed -i "/^$NAME=/{:a;N;s/\n# User: [^\n]*//;s/\n# Password: [^\n]*//;ta}" $FILE
+		sed -i "0,/^$NAME=/!{/^$NAME=/d}" $FILE
+		sed -i "/^$NAME=/ s|=.*|='$ENCRY_CREDENTIALS'|" $FILE
+	else
+		echo -e "\n## Basic Authentication Credentials for:\n$NAME='$ENCRY_CREDENTIALS'" >> $FILE;
+	fi
+	log DEBUG "Saving clear text credentials in $FILE. If wanted, delete them manually."
+	sed -i "/^$NAME=/ s|$|\n# User: $USER\n# Password: $PASSWORD|" $FILE
+	if [ "$(grep -c "^$NAME=" $FILE)" -ne 1 ] || [ "$(sed -n "s|^$NAME='\(.*\)'$|\1|p" $FILE)" != "$ENCRY_CREDENTIALS" ]; then
+		log ERROR "$NAME in $FILE does not hold exactly one set of credentials. Please correct it manually."
+		return 1
+	fi
 }
 
 OIDC_PUBLIC_REDIRECT_URLS=${OIDC_PUBLIC_REDIRECT_URLS:-""}

lib/install-bridgehead.sh

@@ -29,29 +29,29 @@ EOF
 
 # TODO: Determine whether this should be located in setup-bridgehead (triggered through bridgehead install) or in update bridgehead (triggered every hour)
 if [ -z "$LDM_AUTH" ]; then
-  log "INFO" "Now generating basic auth for the local data management (see adduser in bridgehead for more information). "
+  log "INFO" "Now generating basic auth for the local data management (see setuser in bridgehead for more information). "
   generated_passwd="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 32)"
-  add_basic_auth_user $PROJECT $generated_passwd "LDM_AUTH" $PROJECT
+  set_basic_auth_user "$PROJECT" "$generated_passwd" "LDM_AUTH" "$PROJECT"
 fi
 
 if [ ! -z "$NNGM_CTS_APIKEY" ] && [ -z "$NNGM_AUTH" ]; then
-  log "INFO" "Now generating basic auth for nNGM upload API (see adduser in bridgehead for more information). "
+  log "INFO" "Now generating basic auth for nNGM upload API (see setuser in bridgehead for more information). "
   generated_passwd="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 32)"
-  add_basic_auth_user "nngm" $generated_passwd "NNGM_AUTH" $PROJECT
+  set_basic_auth_user "nngm" "$generated_passwd" "NNGM_AUTH" "$PROJECT"
 fi
 
 if [ -z "$TRANSFAIR_AUTH" ]; then
   if [[ -n "$TTP_URL" || -n "$EXCHANGE_ID_SYSTEM" ]]; then
-    log "INFO" "Now generating basic auth user for transfair API (see adduser in bridgehead for more information). "
+    log "INFO" "Now generating basic auth user for transfair API (see setuser in bridgehead for more information). "
     generated_passwd="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 32)"
-    add_basic_auth_user "transfair" $generated_passwd "TRANSFAIR_AUTH" $PROJECT
+    set_basic_auth_user "transfair" "$generated_passwd" "TRANSFAIR_AUTH" "$PROJECT"
   fi
 fi
 
 if [ "$ENABLE_EXPORTER" == "true" ] && [ -z "$EXPORTER_USER" ]; then
-  log "INFO" "Now generating basic auth for the exporter and reporter (see adduser in bridgehead for more information)."
+  log "INFO" "Now generating basic auth for the exporter and reporter (see setuser in bridgehead for more information)."
   generated_passwd="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 32)"
-  add_basic_auth_user $PROJECT $generated_passwd "EXPORTER_USER" $PROJECT
+  set_basic_auth_user "$PROJECT" "$generated_passwd" "EXPORTER_USER" "$PROJECT"
 fi
 
 log "INFO" "Registering system units for bridgehead and bridgehead-update"

lib/update-bridgehead.sh

@@ -140,9 +140,14 @@ fi
 if [ ! -z "$LDM_PASSWORD" ]; then
   FILE="/etc/bridgehead/$PROJECT.local.conf"
   log "INFO" "Migrating LDM_PASSWORD to encrypted credentials in $FILE"
-  add_basic_auth_user $PROJECT $LDM_PASSWORD "LDM_AUTH" $PROJECT
+  if set_basic_auth_user "$PROJECT" "$LDM_PASSWORD" "LDM_AUTH" "$PROJECT"; then
-  add_basic_auth_user $PROJECT $LDM_PASSWORD "NNGM_AUTH" $PROJECT
+    if [ ! -z "$NNGM_CTS_APIKEY" ]; then
-  sed -i "/LDM_PASSWORD/{d;}" $FILE
+      set_basic_auth_user "$PROJECT" "$LDM_PASSWORD" "NNGM_AUTH" "$PROJECT"
+    fi
+    sed -i "/LDM_PASSWORD/{d;}" $FILE
+  else
+    log "ERROR" "Migration failed, keeping LDM_PASSWORD in $FILE for the next attempt."
+  fi
 fi
 
 exit 0