From 091402eea03ebab5159cce0eb33eaafdd932ee83 Mon Sep 17 00:00:00 2001
From: Martin Lablans <6804500+lablans@users.noreply.github.com>
Date: Fri, 30 Sep 2022 17:42:53 +0200
Subject: [PATCH] Update prerequisites.sh

---
 lib/prerequisites.sh | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh
index 28958b3..0bb7882 100755
--- a/lib/prerequisites.sh
+++ b/lib/prerequisites.sh
@@ -72,24 +72,26 @@ source ${PROJECT}/vars
 
 set +e
 SERVERTIME="$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -s -v $BROKER_URL 2>&1)"
-if [ $? -ne 0 ]; then
-	log ERROR "Unable to connect to Samply.Beam broker at $BROKER_URL. Please check your proxy settings.\nThe currently configured proxy was \"$HTTPS_PROXY_URL\"."
-	exit 1
-fi
+RET=$?
 set -e
+if [ $RET -ne 0 ]; then
+	log WARN "Unable to connect to Samply.Beam broker at $BROKER_URL. Please check your proxy settings.\nThe currently configured proxy was \"$HTTPS_PROXY_URL\". This error is normal when using proxy authentication."
+	log WARN "Unable to check clock skew due to previous error."
+else
+	log INFO "Checking clock skew ..."
 
-log INFO "Checking clock skew ..."
-
-SERVERTIME=$(echo -e "$SERVERTIME" | grep Date | sed -e 's/< Date: //')
-SERVERTIME_AS_TIMESTAMP=$(date --date="$SERVERTIME" +%s)
-MYTIME=$(date +%s)
-SKEW=$(($SERVERTIME_AS_TIMESTAMP - $MYTIME))
-SKEW=$(echo $SKEW | awk -F- '{print $NF}')
-if [ $SKEW -ge 300 ]; then
-	log ERROR "Your clock is not synchronized (${SKEW}s off). This will cause Samply.Beam's certificate will fail. Please setup time synchronization. For example, consider entering a correct NTP server (e.g. your institution's Active Directory Domain Controller in /etc/systemd/timesyncd.conf (option NTP=) and restart systemd-timesyncd."
-	exit 1
-elif [ $SKEW -ge 60 ]; then
-	log WARN "Your clock is more than a minute off (${SKEW}s). Consider syncing to a time server."
+	SERVERTIME=$(echo -e "$SERVERTIME" | grep Date | sed -e 's/< Date: //')
+	SERVERTIME_AS_TIMESTAMP=$(date --date="$SERVERTIME" +%s)
+	MYTIME=$(date +%s)
+	SKEW=$(($SERVERTIME_AS_TIMESTAMP - $MYTIME))
+	SKEW=$(echo $SKEW | awk -F- '{print $NF}')
+	SYNCTEXT="For example, consider entering a correct NTP server (e.g. your institution's Active Directory Domain Controller in /etc/systemd/timesyncd.conf (option NTP=) and restart systemd-timesyncd."
+	if [ $SKEW -ge 300 ]; then
+		log ERROR "Your clock is not synchronized (${SKEW}s off). This will cause Samply.Beam's certificate will fail. Please setup time synchronization. $SYNCTEXT"
+		exit 1
+	elif [ $SKEW -ge 60 ]; then
+		log WARN "Your clock is more than a minute off (${SKEW}s). Consider syncing to a time server. $SYNCTEXT"
+	fi
 fi
 
 log INFO "Success - all prerequisites are met!"