From 13dc8221978cc8b7e9811d938d2b216d0af486af Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 4 Mar 2021 11:53:08 -0500
Subject: [PATCH] [wip] Ask user if they want to re-enter the proxy

---
 setup/so-functions | 5 ++---
 setup/so-setup     | 8 ++++++--
 setup/so-whiptail  | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 2b757bad6..a3db35e41 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -551,12 +551,11 @@ collect_proxy() {
 
 		while ! valid_proxy "$proxy_addr"; do
 			whiptail_invalid_input
-			whiptail_proxy_addr
+			whiptail_proxy_addr "$proxy_addr"
 		done
 
 		if whiptail_proxy_auth_ask; then
-			whiptail_proxy_auth_user
-
+			whiptail_proxy_auth_user "$proxy_user"
 			whiptail_proxy_auth_pass
 
 			local url_prefixes=( 'http://' 'https://' )
diff --git a/setup/so-setup b/setup/so-setup
index 18bec9983..66542c6f3 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -301,8 +301,12 @@ if ! [[ -f $install_opt_file ]]; then
 	if [[ $is_manager ]]; then
 		collect_proxy
 		while ! proxy_validate; do
-			whiptail_invalid_proxy
-			collect_proxy no_ask
+			if whiptail_invalid_proxy; then
+				collect_proxy no_ask
+			else
+				proxy_addr=""
+				break
+			fi
 		done
 		[[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1
 	fi
diff --git a/setup/so-whiptail b/setup/so-whiptail
index eaa8e8af1..b7f6fad6c 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -593,12 +593,12 @@ whiptail_invalid_proxy() {
 
 	local message
 	read -r -d '' message <<- EOM
-	Could not reach test url using proxy ${so_proxy}. 
+	Could not reach test url using proxy ${proxy_addr}. 
 	
 	Check log (${setup_log}) for details.
 	EOM
 
-	whiptail --title "Security Onion Setup" --msgbox "$message" 10 60
+	whiptail --title "Security Onion Setup" --yesno "$message" --yestext "Enter Again" --notext "Skip" 10 60
 }
 
 whiptail_invalid_string() {
@@ -1244,7 +1244,7 @@ whiptail_proxy_addr() {
 	If your proxy requires a username and password do not include them in your input. Setup will ask for those values next.
 	EOM
 
-	proxy_addr=$(whiptail --title "Security Onion Setup" --inputbox "$message" 13 60 3>&1 1>&2 2>&3)
+	proxy_addr=$(whiptail --title "Security Onion Setup" --inputbox "$message" 13 60 "$1" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
@@ -1259,7 +1259,7 @@ whiptail_proxy_auth_ask() {
 whiptail_proxy_auth_user() {
 	[ -n "$TESTING" ] && return
 	
-	proxy_user=$(whiptail --title "Security Onion Setup" --inputbox "Please input the proxy user:" 8 60 3>&1 1>&2 2>&3)
+	proxy_user=$(whiptail --title "Security Onion Setup" --inputbox "Please input the proxy user:" 8 60 "$1" 3>&1 1>&2 2>&3)
 }
 
 whiptail_proxy_auth_pass() {