CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change back to validating proxy, show user error message from curl

Browse Source
This commit is contained in:
William Wernert
2021-03-16 10:18:02 -04:00
parent 086f2b3437
commit 59c62393b5
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/so-functions
View File

@@ -568,13 +568,7 @@ collect_proxy_details() {
if whiptail_proxy_auth_ask; then if whiptail_proxy_auth_ask; then
whiptail_proxy_auth_user "$proxy_user" whiptail_proxy_auth_user "$proxy_user"
whiptail_proxy_auth_pass "$proxy_pass"
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://' ) local url_prefixes=( 'http://' 'https://' )
for prefix in "${url_prefixes[@]}"; do for prefix in "${url_prefixes[@]}"; do
@@ -1827,11 +1821,12 @@ print_salt_state_apply() {
proxy_validate() { proxy_validate() {
local test_url="https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS" local test_url="https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS"
curl "$test_url" --proxy "$so_proxy" &> /dev/null proxy_test_err=$(curl -s "$test_url" --proxy "$so_proxy" 2>&1)
local ret=$? local ret=$?
if [[ $ret != 0 ]]; then if [[ $ret != 0 ]]; then
error "Could not reach $test_url using proxy $so_proxy" error "Could not reach $test_url using proxy $so_proxy"
error "Received error: $proxy_test_err"
if [[ -n $TESTING ]]; then if [[ -n $TESTING ]]; then
error "Exiting setup" error "Exiting setup"
kill -SIGINT "$(ps --pid $$ -oppid=)"; exit 1 kill -SIGINT "$(ps --pid $$ -oppid=)"; exit 1

6
setup/so-setup
View File

@@ -213,7 +213,7 @@ if ! [[ -f $install_opt_file ]]; then
"HOSTNAME=$HOSTNAME" > "$net_init_file" "HOSTNAME=$HOSTNAME" > "$net_init_file"
set_main_ip >> $setup_log 2>&1 set_main_ip >> $setup_log 2>&1
compare_main_nic_ip compare_main_nic_ip
reset_prpxy >> $setup_log 2>&1 reset_proxy >> $setup_log 2>&1
collect_proxy collect_proxy
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1 [[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
whiptail_net_setup_complete whiptail_net_setup_complete
@@ -311,9 +311,9 @@ if ! [[ -f $install_opt_file ]]; then
collect_mngr_hostname collect_mngr_hostname
fi fi
reset_prpxy >> $setup_log 2>&1 reset_proxy >> $setup_log 2>&1
if [[ -z $is_airgap ]]; then if [[ -z $is_airgap ]]; then
collect_proxy_details collect_proxy
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1 [[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
fi fi

3
setup/so-whiptail
View File

@@ -595,7 +595,8 @@ whiptail_invalid_proxy() {
read -r -d '' message <<- EOM read -r -d '' message <<- EOM
Could not reach test url using proxy ${proxy_addr}. Could not reach test url using proxy ${proxy_addr}.
Check log (${setup_log}) for details. Error was:
$proxy_test_err
EOM EOM
whiptail --title "Security Onion Setup" --yesno "$message" --yes-button "Enter Again" --no-button "Skip" 10 60 whiptail --title "Security Onion Setup" --yesno "$message" --yes-button "Enter Again" --no-button "Skip" 10 60