From 0d01f63e3be7dd12e6c2ce81db6cf3e0635764d0 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 11 Mar 2021 11:46:46 -0500
Subject: [PATCH] [fix] Confirm proxy password

---
 setup/so-functions | 8 +++++++-
 setup/so-whiptail  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 300d384d0..1f3a6aed0 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -568,7 +568,13 @@ collect_proxy_details() {
 
 		if whiptail_proxy_auth_ask; then
 			whiptail_proxy_auth_user "$proxy_user"
-			whiptail_proxy_auth_pass # Don't pass in existing pass since it's obfuscated
+			
+			local proxy_pass_match=no
+			while [[ $proxy_pass_match != yes ]]; do
+				whiptail_proxy_auth_pass # Don't pass in existing pass since it's obfuscated
+				whiptail_proxy_auth_pass confirm
+				check_pass_match "$proxy_pass" "$proxy_pass_confirm" "proxy_pass_match"
+			done
 
 			local url_prefixes=( 'http://' 'https://' )
 			for prefix in "${url_prefixes[@]}"; do
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 3423dfbe5..051aa60f9 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1267,9 +1267,15 @@ whiptail_proxy_auth_user() {
 }
 
 whiptail_proxy_auth_pass() {
+	local arg=$1
+
 	[ -n "$TESTING" ] && return
 
-	proxy_pass=$(whiptail --title "Security Onion Setup" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3)
+	if [[ $arg != 'confirm' ]]; then
+		proxy_pass=$(whiptail --title "Security Onion Setup" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3)
+	else
+		proxy_pass_confirm=$(whiptail --title "Security Onion Setup" --passwordbox "Please confirm the proxy password:" 8 60 3>&1 1>&2 2>&3)
+	fi
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus