Skip to content

fix: Decode JSON directly from stream in waitForCommandOutput #28040

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

Merged
codingllama merged 1 commit into from
Jun 20, 2023
Merged

fix: Decode JSON directly from stream in waitForCommandOutput #28040

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
20 changes: 6 additions & 14 deletions lib/web/command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,29 +200,21 @@ func waitForCommandOutput(stream io.Reader, substr string) error {
default:
}

out := make([]byte, 100)
n, err := stream.Read(out)
if err != nil {
return trace.Wrap(err)
}

var env Envelope
err = json.Unmarshal(out[:n], &env)
if err != nil {
return trace.Wrap(err)
dec := json.NewDecoder(stream)
if err := dec.Decode(&env); err != nil {
return trace.Wrap(err, "decoding envelope JSON from stream")
}

d, err := base64.StdEncoding.DecodeString(env.Payload)
if err != nil {
return trace.Wrap(err)
return trace.Wrap(err, "decoding b64 payload")
}

data := removeSpace(string(d))
if n > 0 && strings.Contains(data, substr) {
if strings.Contains(data, substr) {
return nil
}
if err != nil {
return trace.Wrap(err)
}
}
}

Expand Down