CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 09:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

[wip] Ask user if they want to re-enter the proxy

Browse Source
This commit is contained in:
William Wernert
2021-03-04 11:53:08 -05:00
parent 5a97341d33
commit 13dc822197
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/so-functions
View File

@@ -551,12 +551,11 @@ collect_proxy() {
while ! valid_proxy "$proxy_addr"; do while ! valid_proxy "$proxy_addr"; do
whiptail_invalid_input whiptail_invalid_input
whiptail_proxy_addr whiptail_proxy_addr "$proxy_addr"
done done
if whiptail_proxy_auth_ask; then if whiptail_proxy_auth_ask; then
whiptail_proxy_auth_user whiptail_proxy_auth_user "$proxy_user"
whiptail_proxy_auth_pass whiptail_proxy_auth_pass
local url_prefixes=( 'http://' 'https://' ) local url_prefixes=( 'http://' 'https://' )

6
setup/so-setup
View File

@@ -301,8 +301,12 @@ if ! [[ -f $install_opt_file ]]; then
if [[ $is_manager ]]; then if [[ $is_manager ]]; then
collect_proxy collect_proxy
while ! proxy_validate; do while ! proxy_validate; do
whiptail_invalid_proxy if whiptail_invalid_proxy; then
collect_proxy no_ask collect_proxy no_ask
else
proxy_addr=""
break
fi
done done
[[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1 [[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1
fi fi

8
setup/so-whiptail
View File

@@ -593,12 +593,12 @@ whiptail_invalid_proxy() {
local message local message
read -r -d '' message <<- EOM 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. Check log (${setup_log}) for details.
EOM 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() { 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. If your proxy requires a username and password do not include them in your input. Setup will ask for those values next.
EOM 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=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
@@ -1259,7 +1259,7 @@ whiptail_proxy_auth_ask() {
whiptail_proxy_auth_user() { whiptail_proxy_auth_user() {
[ -n "$TESTING" ] && return [ -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() { whiptail_proxy_auth_pass() {