From 09c22bbe4340c4ef841f170a126de6e7c8538508 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Wed, 22 Apr 2020 16:59:31 -0400
Subject: [PATCH] [fix] Create arrays for bro_pins and suricata_pins

---
 setup/so-variables |  2 +-
 setup/so-whiptail  | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/setup/so-variables b/setup/so-variables
index d1f66abab..c991ee8bb 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -6,7 +6,7 @@ export total_mem
 num_cpu_cores=$(nproc)
 export num_cpu_cores
 
-readarray -t cpu_core_list <<< "$(grep "processor" /proc/cpuinfo | grep -v "KVM" | awk '{print $3 ""}')"
+readarray -t cpu_core_list <<< "$(grep "processor" /proc/cpuinfo | grep -v "KVM" | awk '{print $3}')"
 export cpu_core_list
 
 random_uid=$(</dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 374252969..06b510096 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -45,9 +45,13 @@ whiptail_basic_suri() {
 whiptail_bro_pins() {
 
 	[ -n "$QUIET" ] && return
-	
-	BROPINS=$(whiptail --noitem --title "Pin Bro CPUS" --checklist "Please Select $lb_procs cores to pin Bro to:" 20 75 12 "${cpu_core_list[@]}" 3>&1 1>&2 2>&3 )
 
+	local cpu_core_list_whiptail=()
+	for item in "${cpu_core_list[@]}"; do
+		cpu_core_list_whiptail+=("$item" "OFF")
+	done
+
+	BROPINS=$(whiptail --noitem --title "Pin Bro CPUS" --checklist "Please select $lb_procs cores to pin Bro to:" 20 75 12 "${cpu_core_list_whiptail[@]}" 3>&1 1>&2 2>&3 )
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 
@@ -545,7 +549,7 @@ whiptail_master_adv_service_brologs() {
 
 	[ -n "$QUIET" ] && return
 
-	BLOGS=$(whiptail --title "Security Onion Setup" --checklist "Please Select Logs to Send:" 24 75 12 \
+	BLOGS=$(whiptail --title "Security Onion Setup" --checklist "Please select Logs to Send:" 24 75 12 \
 	"conn" "Connection Logging" ON \
 	"dce_rpc" "RPC Logs" ON \
 	"dhcp" "DHCP Logs" ON \
@@ -971,10 +975,15 @@ whiptail_suricata_pins() {
 
 	[ -n "$QUIET" ] && return
 
-	local filtered_cores
-	filtered_cores=$(echo "${cpu_core_list[@]}" "${BROPINS[@]}" | sort | uniq -u | awk '{print $1 " \"" "core" "\""}')
-	SURIPINS=$(whiptail --noitem --title "Pin Suricata CPUS" --checklist "Please Select $lb_procs cores to pin Suricata to:" 20 75 12 "${filtered_cores[@]}" 3>&1 1>&2 2>&3 )
+	local filtered_core_list
+	readarray -t filtered_core_list <<< "$(echo "${cpu_core_list[@]}" "${BROPINS[@]}" | xargs -n1 | sort | uniq -u | awk '{print $1}')"
 
+	local filtered_core_str=()
+    for item in "${filtered_core_list[@]}"; do
+        filtered_core_str+=("$item" "")
+    done
+
+	SURIPINS=$(whiptail --noitem --title "Pin Suricata CPUS" --checklist "Please select $lb_procs cores to pin Suricata to:" 20 75 12 "${filtered_core_str[@]}" 3>&1 1>&2 2>&3 )
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus