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 #10644 from Security-Onion-Solutions/cogburn/salt-relay-fix

Browse Source 
WIP: Fix `salt cmd.run` commands for importing
This commit is contained in:
Jason Ertel
2023-06-22 20:31:19 -04:00
committed by GitHub
parent f4cbe20ddf 2b323ab661
commit 7623dd20b9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,8 @@ function import_file() {
filegpg="$file.gpg" filegpg="$file.gpg"
log "decrypting..." log "decrypting..."
$CMD_PREFIX salt "$node" cmd.run "gpg --passphrase \"infected\" -o \"$file.tmp\" --batch --decrypt \"$filegpg\"" decrypt_cmd="gpg --passphrase infected -o $file.tmp --batch --decrypt $filegpg"
$CMD_PREFIX salt "$node" cmd.run "\"$decrypt_cmd\""
decrypt_code=$? decrypt_code=$?
if [[ $decrypt_code -eq 0 ]]; then if [[ $decrypt_code -eq 0 ]]; then
@@ -237,11 +238,13 @@ function import_file() {
log "importing..." log "importing..."
case $importer in case $importer in
pcap) pcap)
response=$($CMD_PREFIX salt "$node" cmd.run "so-import-pcap $file --json") import_cmd="so-import-pcap $file --json"
response=$($CMD_PREFIX salt "$node" cmd.run "\"$import_cmd\"")
exit_code=$? exit_code=$?
;; ;;
evtx) evtx)
response=$($CMD_PREFIX salt "$node" cmd.run "so-import-evtx $file --json") import_cmd="so-import-evtx $file --json"
response=$($CMD_PREFIX salt "$node" cmd.run "\"$import_cmd\"")
exit_code=$? exit_code=$?
;; ;;
*) *)