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

Merge pull request #9648 from Security-Onion-Solutions/mkr24

Browse Source 
Enable Proxy Support
This commit is contained in:
Mike Reeves
2023-01-26 11:12:35 -05:00
committed by GitHub
parent 211b87e7ae 2456aac311
commit a9919e7547
3 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
setup/so-functions
View File

@@ -385,14 +385,9 @@ collect_mngr_hostname() {
collect_net_method() { collect_net_method() {
whiptail_net_method whiptail_net_method
if [[ "$network_traffic" == *"_MANAGER" ]]; then
whiptail_manager_updates_warning
MANAGERUPDATES=1
fi
if [[ "$network_traffic" == "PROXY"* ]]; then if [[ "$network_traffic" == "PROXY"* ]]; then
collect_proxy no_ask collect_proxy no_ask
needs_proxy=true
fi fi
} }

8
setup/so-setup
View File

@@ -142,6 +142,7 @@ if [[ -f /root/accept_changes ]]; then
mv "$setup_log" "$setup_log.bak" mv "$setup_log" "$setup_log.bak"
[ -f "$error_log" ] && mv "$error_log" "$error_log.bak" [ -f "$error_log" ] && mv "$error_log" "$error_log.bak"
reinstall_init reinstall_init
reset_proxy
fi fi
title "Parsing Username for Install" title "Parsing Username for Install"
@@ -319,6 +320,7 @@ if ! [[ -f $install_opt_file ]]; then
check_elastic_license check_elastic_license
check_requirements "manager" check_requirements "manager"
networking_needful networking_needful
collect_net_method
collect_dockernet collect_dockernet
if [[ $is_iso ]]; then if [[ $is_iso ]]; then
whiptail_airgap whiptail_airgap
@@ -342,6 +344,7 @@ if ! [[ -f $install_opt_file ]]; then
check_elastic_license check_elastic_license
check_requirements "manager" check_requirements "manager"
networking_needful networking_needful
collect_net_method
collect_dockernet collect_dockernet
if [[ $is_iso ]]; then if [[ $is_iso ]]; then
whiptail_airgap whiptail_airgap
@@ -364,6 +367,7 @@ if ! [[ -f $install_opt_file ]]; then
ubuntu_check ubuntu_check
check_requirements "manager" check_requirements "manager"
networking_needful networking_needful
collect_net_method
collect_dockernet collect_dockernet
if [[ $is_iso ]]; then if [[ $is_iso ]]; then
whiptail_airgap whiptail_airgap
@@ -384,6 +388,7 @@ if ! [[ -f $install_opt_file ]]; then
ubuntu_check ubuntu_check
check_requirements "manager" check_requirements "manager"
networking_needful networking_needful
collect_net_method
collect_dockernet collect_dockernet
if [[ $is_iso ]]; then if [[ $is_iso ]]; then
whiptail_airgap whiptail_airgap
@@ -485,6 +490,9 @@ if ! [[ -f $install_opt_file ]]; then
percentage=0 percentage=0
es_heapsize es_heapsize
ls_heapsize ls_heapsize
if [[ $needs_proxy ]]; then
set_proxy
fi
set_redirect set_redirect
# Generate Interface Vars # Generate Interface Vars
generate_interface_vars generate_interface_vars

31
setup/so-whiptail
View File

@@ -816,34 +816,15 @@ whiptail_net_method() {
) )
local proxy_desc="proxy the traffic for git, docker client, wget, curl, ${pkg_mngr}, and various other SO components through a separate server in your environment." local proxy_desc="proxy the traffic for git, docker client, wget, curl, ${pkg_mngr}, and various other SO components through a separate server in your environment."
if [[ $is_minion ]]; then read -r -d '' options_msg <<- EOM
read -r -d '' options_msg <<- EOM
${options_msg} ${options_msg}
"Direct + Manager" - all traffic passes to the Internet normally, but ${pkg_mngr} updates will instead be pulled from ${mngr_article} manager.
"Proxy" - ${proxy_desc} "Proxy" - ${proxy_desc}
EOM
options+=(
" Proxy " ""
)
"Proxy + Manager" - proxy all traffic from the "Proxy" option except ${pkg_mngr} updates, which will instead pull from the manager. local height=17
EOM
options+=(
" Direct + Manager " ""
" Proxy " ""
" Proxy + Manager " ""
)
local height=25
else
read -r -d '' options_msg <<- EOM
${options_msg}
"Proxy" - ${proxy_desc}
EOM
options+=(
" Proxy " ""
)
local height=17
fi
local msg local msg
read -r -d '' msg <<- EOM read -r -d '' msg <<- EOM