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

[fix] Don't try to create so_proxy during automated installs, just set it

Browse Source
This commit is contained in:
William Wernert
2021-03-08 12:26:17 -05:00
parent 368b04b24e
commit 5c7d3656dd
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/automation/standalone-net-centos-proxy
View File

@@ -62,7 +62,7 @@ OSQUERY=1
# PATCHSCHEDULEHOURS= # PATCHSCHEDULEHOURS=
PATCHSCHEDULENAME=auto PATCHSCHEDULENAME=auto
PLAYBOOK=1 PLAYBOOK=1
proxy_addr=http://10.66.166.30:3128 so_proxy=http://10.66.166.30:3128
# REDIRECTHOST= # REDIRECTHOST=
REDIRECTINFO=IP REDIRECTINFO=IP
RULESETUP=ETOPEN RULESETUP=ETOPEN

3
setup/so-functions
View File

@@ -536,6 +536,7 @@ collect_patch_schedule_name_import() {
} }
collect_proxy() { collect_proxy() {
[[ -n $TESTING ]] && return
collect_proxy_details collect_proxy_details
while ! proxy_validate; do while ! proxy_validate; do
if whiptail_invalid_proxy; then if whiptail_invalid_proxy; then
@@ -571,7 +572,7 @@ collect_proxy_details() {
local url_prefixes=( 'http://' 'https://' ) local url_prefixes=( 'http://' 'https://' )
for prefix in "${url_prefixes[@]}"; do for prefix in "${url_prefixes[@]}"; do
if echo "$proxy_addr" | grep "$prefix"; then if echo "$proxy_addr" | grep -q "$prefix"; then
local proxy=${proxy_addr#"$prefix"} local proxy=${proxy_addr#"$prefix"}
so_proxy="${prefix}${proxy_user}:${proxy_pass}@${proxy}" so_proxy="${prefix}${proxy_user}:${proxy_pass}@${proxy}"
break break

7
setup/so-whiptail
View File

@@ -1237,6 +1237,7 @@ whiptail_proxy_ask() {
whiptail_proxy_addr() { whiptail_proxy_addr() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
local message local message
read -r -d '' message <<- EOM read -r -d '' message <<- EOM
Please input the proxy server you wish to use, including the URL prefix (ex: https://your.proxy.com:1234). Please input the proxy server you wish to use, including the URL prefix (ex: https://your.proxy.com:1234).
@@ -1260,12 +1261,18 @@ 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 "$1" 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)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
} }
whiptail_proxy_auth_pass() { whiptail_proxy_auth_pass() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
proxy_pass=$(whiptail --title "Security Onion Setup" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3) proxy_pass=$(whiptail --title "Security Onion Setup" --passwordbox "Please input the proxy password:" 8 60 3>&1 1>&2 2>&3)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
} }
whiptail_requirements_error() { whiptail_requirements_error() {