Skip to content

Backlog/v12 soar command execution #2333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AlexSanchez-bit wants to merge 1 commit into from
Closed

Backlog/v12 soar command execution #2333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 31 additions & 32 deletions backend/modules/soar/handler/command_ws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,42 +154,41 @@ func (h *CommandWSHandler) CommandStream(c *gin.Context) {
}
resultCh, errCh := h.agentClient.ProcessCommandStream(ctx, cmd)

for {
select {
case result, ok := <-resultCh:
if !ok {
_ = wsjson.Write(ctx, conn, wsMessage{Type: "done"})
_ = conn.Close(websocket.StatusNormalClosure, "stream complete")
return
}
output := result.GetResult()
if h.variableUC != nil {
if masked, mErr := h.variableUC.MaskSecrets(output); mErr != nil {
_ = catcher.Error("CommandStream: mask secrets", mErr, nil)
} else {
output = masked
}
}
msg := wsMessage{Type: "output", Data: output}
if writeErr := wsjson.Write(ctx, conn, msg); writeErr != nil {
cancel()
return
}

case grpcErr, ok := <-errCh:
if !ok {
return
}
if grpcErr != nil {
_ = catcher.Error("CommandStream: grpc error", grpcErr, nil)
errMsg, _ := json.Marshal(wsMessage{Type: "error", Message: grpcErr.Error()})
_ = conn.Write(ctx, websocket.MessageText, errMsg)
_ = conn.Close(websocket.StatusInternalError, "grpc error")
// ponytail: one command → one CommandResult (see agent-manager ProcessCommand).
// Server never closes the stream, so we don't wait for !ok — we finalize on the first result.
select {
case result, ok := <-resultCh:
if !ok {
_ = conn.Close(websocket.StatusNormalClosure, "stream complete")
return
}
output := result.GetResult()
if h.variableUC != nil {
if masked, mErr := h.variableUC.MaskSecrets(output); mErr != nil {
_ = catcher.Error("CommandStream: mask secrets", mErr, nil)
} else {
output = masked
}
}
if writeErr := wsjson.Write(ctx, conn, wsMessage{Type: "output", Data: output}); writeErr != nil {
_ = catcher.Error("CommandStream: write output", writeErr, nil)
cancel()
return
}
if doneErr := wsjson.Write(ctx, conn, wsMessage{Type: "done"}); doneErr != nil {
_ = catcher.Error("CommandStream: write done", doneErr, nil)
}
_ = conn.Close(websocket.StatusNormalClosure, "command complete")

case <-ctx.Done():
case grpcErr, ok := <-errCh:
if !ok || grpcErr == nil {
return
}
_ = catcher.Error("CommandStream: grpc error", grpcErr, nil)
errMsg, _ := json.Marshal(wsMessage{Type: "error", Message: grpcErr.Error()})
_ = conn.Write(ctx, websocket.MessageText, errMsg)
_ = conn.Close(websocket.StatusInternalError, "grpc error")

case <-ctx.Done():
}
}
Loading