From ab4285aaaf2dfe979ad7bb4212df8cad990182f6 Mon Sep 17 00:00:00 2001
From: Wes Lambert <wlambertts@gmail.com>
Date: Fri, 14 Aug 2020 15:21:56 +0000
Subject: [PATCH] Only copy TheHive details to global pillar if enabled

---
 setup/so-functions | 62 +++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index c43e668bc..7468ec01b 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -879,11 +879,13 @@ generate_passwords(){
   PLAYBOOKPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)
   FLEETPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   FLEETJWT=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
-  HIVEKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
-  HIVEPLAYSECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
-  CORTEXKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
-  CORTEXORGUSERKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
-  CORTEXPLAYSECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  if [[ "$THEHIVE" == "1" ]]; then
+  	HIVEKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  	HIVEPLAYSECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  	CORTEXKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  	CORTEXORGUSERKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  	CORTEXPLAYSECRET=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
+  fi
   SENSORONIKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
   KRATOSKEY=$(tr -dc 'a-zA-Z0-9' < /dev/urandom  | fold -w 20 | head -n 1)
 }
@@ -1022,26 +1024,34 @@ manager_global() {
 	fi
 
 	# Create a global file for global values
+        printf '%s\n'\
+                "global:"\
+                "  soversion: $SOVERSION"\
+                "  hnmanager: $HNMANAGER"\
+                "  ntpserver: $NTPSERVER"\
+                "  proxy: $PROXY"\
+                "  zeekversion: $ZEEKVERSION"\
+                "  ids: $NIDS"\
+                "  managerip: $MAINIP" > "$global_pillar"
+
+        # Check if TheHive is enabled.  If so, add creds and other details
+        if [[ "$THEHIVE" == "1" ]]; then
+                printf '%s\n'\
+                        "  hiveuser: $WEBUSER"\
+                        "  hivepassword: '$WEBPASSWD1'"\
+                        "  hivekey: $HIVEKEY"\
+                        "  hiveplaysecret: $HIVEPLAYSECRET"\
+                        "  cortexuser: $WEBUSER"\
+                        "  cortexpassword: '$WEBPASSWD1'"\
+                        "  cortexkey: $CORTEXKEY"\
+                        "  cortexorgname: SecurityOnion"\
+                        "  cortexorguser: soadmin"\
+                        "  cortexorguserkey: $CORTEXORGUSERKEY"\
+                        "  cortexplaysecret: $CORTEXPLAYSECRET" >> "$global_pillar"
+        fi
+
+        # Continue adding other details	
 	printf '%s\n'\
-		"global:"\
-		"  soversion: $SOVERSION"\
-		"  hnmanager: $HNMANAGER"\
-		"  ntpserver: $NTPSERVER"\
-		"  proxy: $PROXY"\
-		"  zeekversion: $ZEEKVERSION"\
-		"  ids: $NIDS"\
-		"  managerip: $MAINIP"\
-		"  hiveuser: $WEBUSER"\
-		"  hivepassword: '$WEBPASSWD1'"\
-		"  hivekey: $HIVEKEY"\
-		"  hiveplaysecret: $HIVEPLAYSECRET"\
-		"  cortexuser: $WEBUSER"\
-		"  cortexpassword: '$WEBPASSWD1'"\
-		"  cortexkey: $CORTEXKEY"\
-		"  cortexorgname: SecurityOnion"\
-		"  cortexorguser: soadmin"\
-		"  cortexorguserkey: $CORTEXORGUSERKEY"\
-		"  cortexplaysecret: $CORTEXPLAYSECRET"\
 		"  fleet_custom_hostname: "\
 		"  fleet_manager: False"\
 		"  fleet_node: False"\
@@ -1132,7 +1142,7 @@ manager_global() {
 		"  time_file: 1"\
 		"  upload_queue_size: 4"\
 		"  encoding: gzip"\
-		"  interval: 5" > "$global_pillar"
+		"  interval: 5" >> "$global_pillar"
 		
 	printf '%s\n'  '----' >> "$setup_log" 2>&1
 	cat "$global_pillar" >> "$setup_log" 2>&1
@@ -1872,4 +1882,4 @@ zeek_logs_enabled() {
 
 	printf '%s\n'  '----' >> "$setup_log" 2>&1
 	cat "$zeeklogs_pillar" >> "$setup_log" 2>&1
-}
\ No newline at end of file
+}