From 90f085b2d78467a75b34c2513e28f6edaf495a70 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Wed, 13 Jan 2021 15:57:21 -0500
Subject: [PATCH] [fix] Fail setup early if we can't determine version of
 manager

---
 setup/so-functions | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 25407c8fa..f1728dd71 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1213,12 +1213,21 @@ docker_seed_registry() {
 }
 
 download_repo_tarball() {
-	mkdir -p /root/manager_setup/securityonion
-	{
-		local manager_ver
-		manager_ver=$(ssh -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion)
-		scp -i /root/.ssh/so.key soremote@"$MSRV":/opt/so/repo/"$manager_ver".tar.gz /root/manager_setup
-	} >> "$setup_log" 2>&1
+
+	mkdir -p /root/manager_setup
+
+	local manager_ver
+	manager_ver=$($sshcmd -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion) >> "$setup_log" 2>&1
+
+	# Fail if we can't determine the version
+	if [[ $manager_ver == '' ]]; then
+		rm /root/install_opt
+		local message="Could not determine the version of Security Onion running on the manager, please check your network settings."
+		echo "$message" | tee -a "$setup_log"
+		kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 
+	fi
+
+	$scpcmd -i /root/.ssh/so.key soremote@"$MSRV":/opt/so/repo/"$manager_ver".tar.gz /root/manager_setup >> "$setup_log" 2>&1
 	
 	# Fail if the file doesn't download
 	if ! [ -f /root/manager_setup/"$manager_ver".tar.gz ]; then
@@ -1227,7 +1236,8 @@ download_repo_tarball() {
 		echo "$message" | tee -a "$setup_log"
 		kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
 	fi
-	
+
+	mkdir -p /root/manager_setup/securityonion
 	{
 		tar -xzf /root/manager_setup/"$manager_ver".tar.gz -C /root/manager_setup/securityonion
 		rm -rf /root/manager_setup/"$manager_ver".tar.gz