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

[refactor] Standardize list inputs to comma separated

Browse Source
This commit is contained in:
William Wernert
2021-01-13 11:36:20 -05:00
parent d254fd960a
commit 4dc3a6aa35
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/tools/sbin/so-common
View File

@@ -264,7 +264,7 @@ valid_cidr_list() {
valid_dns_list() { valid_dns_list() {
local all_valid=0 local all_valid=0
read -r -a dns_arr <<< "$1" IFS="," read -r -a dns_arr <<< "$1"
for addr in "${dns_arr[@]}"; do for addr in "${dns_arr[@]}"; do
valid_ip4 "$addr" || all_valid=1 valid_ip4 "$addr" || all_valid=1

2
setup/so-functions
View File

@@ -392,6 +392,8 @@ collect_dns() {
whiptail_invalid_input whiptail_invalid_input
whiptail_management_interface_dns whiptail_management_interface_dns
done done
MDNS=$(echo "$MDNS" | tr -s "," " ") # MDNS needs to be space separated, we prompt for comma separated for consistency
} }
collect_dns_domain() { collect_dns_domain() {

3
setup/so-whiptail
View File

@@ -669,10 +669,11 @@ whiptail_management_interface_dns() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
MDNS=$(whiptail --title "Security Onion Setup" --inputbox \ MDNS=$(whiptail --title "Security Onion Setup" --inputbox \
"Enter your DNS servers separated by a space:" 10 60 8.8.8.8 8.8.4.4 3>&1 1>&2 2>&3) "Enter your DNS servers separated by commas:" 10 60 "8.8.8.8,8.8.4.4" 3>&1 1>&2 2>&3)
local exitstatus=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }
whiptail_management_interface_dns_search() { whiptail_management_interface_dns_search() {