Fix salt cmd.run commands for importing

Functional and easy to read.
This commit is contained in:
Corey Ogburn
2023-06-22 17:30:56 -06:00
parent f4cbe20ddf
commit 2b323ab661

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=$?
;; ;;
*) *)