Merge pull request #11241 from Security-Onion-Solutions/jertel/sod

salt/common/tools/sbin/so-test

@@ -11,4 +11,4 @@ set -e
 so-tcpreplay /opt/samples/* 2> /dev/null
 
 # Ingest sample pfsense log entry
-echo "<134>$(date '+%b %d %H:%M:%S') filterlog[31624]: 84,,,1567509287,igb0.244,match,pass,in,4,0x0,,64,0,0,DF,6,tcp,64,192.168.1.1,10.10.10.10,56320,443,0,S,3333585167,,65535,,mss;nop;wscale;nop;nop;TS;sackOK;eol" | nc -uv -w1 localhost 514 > /dev/null 2>&1
+echo "<134>$(date '+%b %d %H:%M:%S') filterlog[31624]: 84,,,1567509287,igb0.244,match,pass,in,4,0x0,,64,0,0,DF,6,tcp,64,192.168.1.1,10.10.10.10,56320,443,0,S,3333585167,,65535,,mss;nop;wscale;nop;nop;TS;sackOK;eol" | nc -uv -w1 127.0.0.1 514 > /dev/null 2>&1

salt/soc/defaults.yaml

@@ -1012,6 +1012,7 @@ soc:
           verifyCert: false
         salt:
           queueDir: /opt/sensoroni/queue
+          timeoutMs: 45000
           longRelayTimeoutMs: 120000
         sostatus:
           refreshIntervalMs: 30000

salt/soc/soc_soc.yaml

@@ -116,6 +116,10 @@ soc:
             description: Duration (in milliseconds) to wait for a response from the Salt API when executing tasks known for being long running before giving up and showing an error on the SOC UI.
             global: True
             advanced: True
+          relayTimeoutMs:
+            description: Duration (in milliseconds) to wait for a response from the Salt API when executing common grid management tasks before giving up and showing an error on the SOC UI.
+            global: True
+            advanced: True
       client:
         enableReverseLookup:
           description: Set to true to enable reverse DNS lookups for IP addresses in the SOC UI.

setup/so-functions

@@ -101,8 +101,10 @@ desktop_salt_local() {
 		Press the Enter key to reboot.
 	EOM
 
-	whiptail --title "$whiptail_title" --msgbox "$message" 12 75
-	reboot
+	if [[ -z "$TESTING" ]]; then
+		whiptail --title "$whiptail_title" --msgbox "$message" 12 75
+		reboot
+	fi
 	exit 0 
 
 }

setup/so-setup

@@ -174,6 +174,7 @@ if [ -n "$test_profile" ]; then
 
 	# The below settings are hardcoded purely for automated testing purposes.
 	TESTING=true
+	is_desktop_grid=false
 	
 	if [[ "$test_profile" =~ "-sensor" ]]; then
 		install_type=SENSOR
@@ -183,10 +184,27 @@ if [ -n "$test_profile" ]; then
 		install_type=SEARCHNODE
 		HOSTNAME=search
 		MSRVIP_OFFSET=-1
-	else
+	elif [[ "$test_profile" =~ "-managersearch" ]]; then
+		install_type=MANAGERSEARCH
+	elif [[ "$test_profile" =~ "-heavynode" ]]; then
+		install_type=HEAVYNODE
+		HOSTNAME=sensor
+		MSRVIP_OFFSET=-1
+	elif [[ "$test_profile" =~ "-desktop" ]]; then
+		install_type=DESKTOP
+		MSRVIP_OFFSET=-3
+		is_desktop_grid=true
+	fi
+	
+	if [[ -z "$HOSTNAME" ]]; then
 		HOSTNAME=manager
 	fi
 
+	if [[ "$install_type" =~ "DESKTOP" ]]; then
+		is_desktop=true
+		HOSTNAME=desktop
+	fi
+	
 	info "Activating test profile; profile=$test_profile; install_type=$install_type"
 
 	MINION_CIDR=10.0.0.0/8

setup/so-whiptail

@@ -563,7 +563,7 @@ whiptail_install_type() {
 			"EVAL" "Evaluation mode (not for production) " \
 			"STANDALONE" "Standalone production install " \
 			"DISTRIBUTED" "Distributed install submenu " \
-			"OTHER" "Other install types" \
+			"DESKTOP" "Install Security Onion Desktop" \
 			3>&1 1>&2 2>&3
 		)
 	elif [[ "$OSVER" == "focal" ]]; then
@@ -584,8 +584,6 @@ whiptail_install_type() {
 		else
 			whiptail_install_type_dist_existing
 		fi
-	elif [[ $install_type == "OTHER" ]]; then
-		whiptail_install_type_other
 	fi
 
 	export install_type
@@ -691,21 +689,6 @@ whiptail_install_type_dist_existing() {
 	whiptail_check_exitstatus $exitstatus
 }
 
-
-whiptail_install_type_other() {
-
-	[ -n "$TESTING" ] && return
-
-	install_type=$(whiptail --title "$whiptail_title" --menu \
-		"Choose node type:" 10 65 2 \
-		"DESKTOP" "Install Security Onion Desktop " 3>&1 1>&2 2>&3)
-	
-	local exitstatus=$?
-	whiptail_check_exitstatus $exitstatus
-
-	export install_type
-}
-
 whiptail_invalid_input() { # TODO: This should accept a list of arguments to specify what general pattern the input should follow
 	[ -n "$TESTING" ] && return