From 189c02648d09749d3ab2805886682ca5e2202d8f Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Mon, 31 Aug 2020 09:52:06 -0400
Subject: [PATCH] Move container status check to so-common

---
 salt/common/tools/sbin/so-common           | 21 +++++++++++++--------
 salt/common/tools/sbin/so-cortex-user-add  |  2 +-
 salt/common/tools/sbin/so-thehive-user-add |  2 +-
 salt/common/tools/sbin/so-user             | 19 ++++---------------
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index 635910638..7f436a85d 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -19,24 +19,29 @@ IMAGEREPO=securityonion
 
 # Check for prerequisites
 if [ "$(id -u)" -ne 0 ]; then
-        echo "This script must be run using sudo!"
-        exit 1
+    echo "This script must be run using sudo!"
+    exit 1
 fi
 
 # Define a banner to separate sections
 banner="========================================================================="
 
 header() {
-        echo
-        printf '%s\n' "$banner" "$*" "$banner"
+	echo
+    printf '%s\n' "$banner" "$*" "$banner"
 }
 
 lookup_pillar() {
-        key=$1
-        cat /opt/so/saltstack/local/pillar/global.sls | grep $key | awk '{print $2}'
+    key=$1
+    cat /opt/so/saltstack/local/pillar/global.sls | grep $key | awk '{print $2}'
 }
 
 lookup_pillar_secret() {
-        key=$1
-        cat /opt/so/saltstack/local/pillar/secrets.sls | grep $key | awk '{print $2}'
+    key=$1
+    cat /opt/so/saltstack/local/pillar/secrets.sls | grep $key | awk '{print $2}'
+}
+
+check_container() {
+	docker ps | grep "$1:" > /dev/null 2>&1
+	return $?
 }
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-cortex-user-add b/salt/common/tools/sbin/so-cortex-user-add
index 6d6b0d582..531872d80 100644
--- a/salt/common/tools/sbin/so-cortex-user-add
+++ b/salt/common/tools/sbin/so-cortex-user-add
@@ -47,7 +47,7 @@ resp=$(curl -sk -XPOST -H "Authorization: Bearer $CORTEX_KEY" -H "Content-Type:
 if [[ "$resp" =~ \"status\":\"Ok\" ]]; then
     echo "Successfully added user to Cortex."
 else
-    echo "Failed to add user to Cortex. See API response below."
+    echo "Failed to add user to Cortex."
     exit 2
 fi
     
\ No newline at end of file
diff --git a/salt/common/tools/sbin/so-thehive-user-add b/salt/common/tools/sbin/so-thehive-user-add
index 61c655c61..0867ad766 100644
--- a/salt/common/tools/sbin/so-thehive-user-add
+++ b/salt/common/tools/sbin/so-thehive-user-add
@@ -46,7 +46,7 @@ resp=$(curl -sk -XPOST -H "Authorization: Bearer $THEHIVE_KEY" -H "Content-Type:
 if [[ "$resp" =~ \"status\":\"Ok\" ]]; then
     echo "Successfully added user to TheHive."
 else
-    echo "Failed to add user to TheHive. See API response below."
+    echo "Failed to add user to TheHive."
     echo $resp
     exit 2
 fi
diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index 7f376329c..f4a53efa7 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -8,18 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-got_root() {
-
-  # Make sure you are root
-  if [ "$(id -u)" -ne 0 ]; then
-          echo "This script must be run using sudo!"
-          exit 1
-  fi
-
-}
-
-# Make sure the user is root
-got_root
+. /usr/sbin/so-common
 
 if [[ $# < 1 || $# > 2 ]]; then
   echo "Usage: $0 <list|add|update|delete|validate|valemail|valpass> [email]"
@@ -190,9 +179,9 @@ case "${operation}" in
     validateEmail "$email"
     createUser "$email"
     echo "Successfully added new user to SOC"
-    docker ps | grep so-thehive > /dev/null 2>&1 && echo $password | so-thehive-user-add "$email"
-    docker ps | grep so-cortex > /dev/null 2>&1 && echo $password | so-cortex-user-add "$email"
-    docker ps | grep so-fleet > /dev/null 2>&1 && echo $password | so-fleet-user-add "$email"
+    check_container thehive && echo $password | so-thehive-user-add "$email"
+    check_container cortex && echo $password | so-cortex-user-add "$email"
+    check_container fleet && echo $password | so-fleet-user-add "$email"
     ;;
 
   "list")