CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15118 from Security-Onion-Solutions/jertel/wip

Browse Source 
support non-async state apply
This commit is contained in:
Jason Ertel
2025-10-08 13:15:05 -04:00
committed by GitHub
parent 23e25fa2d7 bad9a16ebb
commit a22c9f6bcf
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
salt/soc/files/bin/salt-relay.sh
View File

@@ -237,10 +237,22 @@ function manage_salt() {
case "$op" in case "$op" in
state) state)
log "Performing '$op' for '$state' on minion '$minion'"
state=$(echo "$request" | jq -r .state) state=$(echo "$request" | jq -r .state)
response=$(salt --async "$minion" state.apply "$state" queue=2) async=$(echo "$request" | jq -r .async)
if [[ $async == "true" ]]; then
log "Performing async '$op' on minion $minion with state '$state'"
response=$(salt --async "$minion" state.apply "$state" queue=2)
else
log "Performing '$op' on minion $minion with state '$state'"
response=$(salt "$minion" state.apply "$state")
fi
exit_code=$? exit_code=$?
if [[ $exit_code -ne 0 && "$response" =~ "is running as PID" ]]; then
log "Salt already running: $response ($exit_code)"
respond "$id" "ERROR_SALT_ALREADY_RUNNING"
return
fi
;; ;;
highstate) highstate)
log "Performing '$op' on minion $minion" log "Performing '$op' on minion $minion"
@@ -259,7 +271,7 @@ function manage_salt() {
;; ;;
esac esac
if [[ exit_code -eq 0 ]]; then if [[ $exit_code -eq 0 ]]; then
log "Successful command execution: $response" log "Successful command execution: $response"
respond "$id" "true" respond "$id" "true"
else else