From 11820a16f0919845d254530129fa90ee32bf9082 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Tue, 29 Oct 2024 12:04:38 -0400
Subject: [PATCH] connect

---
 salt/manager/tools/sbin/so-client | 18 +++++++++++++++---
 salt/soc/files/bin/salt-relay.sh  |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/salt/manager/tools/sbin/so-client b/salt/manager/tools/sbin/so-client
index 944214dd5..c1d352328 100755
--- a/salt/manager/tools/sbin/so-client
+++ b/salt/manager/tools/sbin/so-client
@@ -28,6 +28,7 @@ function usage() {
             Optional parameters: 
               --role <role>             (defaults to $DEFAULT_ROLE)
               --note <note>             (defaults to blank)
+              --raw                     only output generated secret
 
     delete: Deletes a client from the oauth2 system
             Required parameters: 
@@ -53,7 +54,7 @@ function usage() {
             Required parameters: 
               --id <id>
             Optional parameters: 
-              --skip-sync               (defers the Elastic sync until the next scheduled time)
+              --raw                     only output generated secret
 
 USAGE_EOF
   exit 1
@@ -86,6 +87,9 @@ while [[ $# -gt 0 ]]; do
       note=$1
       shift
       ;;
+    --raw) 
+      raw=1
+      ;;
     *) 
       echo "Encountered unexpected parameter: $param"
       usage
@@ -322,7 +326,11 @@ case "${operation}" in
 
     lock
     createClient "$name" "${role:-$DEFAULT_ROLE}" "${note}"
-    echo "Successfully added user and generated secret: $secret"
+    if [[ "$raw" == "1" ]]; then
+      echo $secret
+    else
+      echo "Successfully added user and generated secret: $secret"
+    fi
     ;;
 
   "list")
@@ -368,7 +376,11 @@ case "${operation}" in
 
     lock
     generateSecret "$id"
-    echo "Successfully generated secret: $secret"
+    if [[ "$raw" == "1" ]]; then
+      echo $secret
+    else
+      echo "Successfully generated secret: $secret"
+    fi
     ;;
 
   "delete")
diff --git a/salt/soc/files/bin/salt-relay.sh b/salt/soc/files/bin/salt-relay.sh
index 8186e7941..241e33663 100755
--- a/salt/soc/files/bin/salt-relay.sh
+++ b/salt/soc/files/bin/salt-relay.sh
@@ -170,7 +170,7 @@ function manage_client() {
         name=$(echo "$request" | jq -r .name)
         note=$(echo "$request" | jq -r .note)
         log "Performing client '$op' for client with name '$name', note '$note' and role '$role'"
-        response=$(so-client "$op" --name "$name" --note "$note" --role "$role" --skip-sync)
+        response=$(so-client "$op" --name "$name" --note "$note" --role "$role" --raw)
         webResponse=$resposne
         exit_code=$?
         ;;
@@ -190,7 +190,7 @@ function manage_client() {
       generate-secret)
         client_id=$(echo "$request" | jq -r .id)
         log "Performing '$op' operation for client '$client_id'"
-        response=$(so-client "$op" --id "$client_id")
+        response=$(so-client "$op" --id "$client_id" --raw)
         webResponse=$response
         exit_code=$?
         ;;