Skip to content

Perform Base64 decode before JSON validation in create payloads #1074

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

Draft
ks-temporal wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Perform Base64 decode before JSON validation in create payloads #1074

Show file tree
Hide file tree
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
30 changes: 30 additions & 0 deletions internal/temporalcli/commands.activity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package temporalcli_test

import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"strings"
Expand Down Expand Up @@ -760,6 +761,35 @@ func (s *SharedServerSuite) TestActivity_Execute_RetriesOnEmptyPollResponse() {
s.Contains(res.Stdout.String(), "standalone-result")
}

func (s *SharedServerSuite) TestActivity_Execute_JsonWithBase64() {
var receivedInput any
s.Worker().OnDevActivity(func(ctx context.Context, a any) (any, error) {
receivedInput = a
return map[string]string{"foo": "bar"}, nil
})

jsonInput := `"my-input"` // JSON string as input, before base64 encode
base64Input := base64.StdEncoding.EncodeToString([]byte(jsonInput))
res := s.Execute(
"activity", "execute",
"--activity-id", "exec-test",
"--type", "DevActivity",
"--task-queue", s.Worker().Options.TaskQueue,
"--start-to-close-timeout", "30s",
"-i", base64Input,
"--input-base64",
"--address", s.Address(),
)
s.NoError(res.Err)
out := res.Stdout.String()
s.Contains(out, "Running execution:")
s.ContainsOnSameLine(out, "ActivityId", "exec-test")
s.Contains(out, "Results:")
s.ContainsOnSameLine(out, "Status", "COMPLETED")
s.ContainsOnSameLine(out, "Result", `{"foo":"bar"}`)
s.Equal("my-input", receivedInput)
}

// startActivity starts an activity via the CLI and returns
// the parsed JSON response containing activityId and runId.
func (s *SharedServerSuite) startActivity(activityID string, extraArgs ...string) map[string]any {
Expand Down
14 changes: 7 additions & 7 deletions internal/temporalcli/payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ import (
func CreatePayloads(data [][]byte, metadata map[string][][]byte, isBase64 bool) (*common.Payloads, error) {
ret := &common.Payloads{Payloads: make([]*common.Payload, len(data))}
for i, in := range data {
// Decode base64 if base64'd (std encoding only for now)
if isBase64 {
var err error
if in, err = base64.StdEncoding.DecodeString(string(in)); err != nil {
return nil, fmt.Errorf("input #%v is not valid base64", i+1)
}
}
var metadataForIndex = make(map[string][]byte, len(metadata))
for k, vals := range metadata {
if len(vals) == 0 {
Expand All @@ -29,13 +36,6 @@ func CreatePayloads(data [][]byte, metadata map[string][][]byte, isBase64 bool)
}
metadataForIndex[k] = v
}
// Decode base64 if base64'd (std encoding only for now)
if isBase64 {
var err error
if in, err = base64.StdEncoding.DecodeString(string(in)); err != nil {
return nil, fmt.Errorf("input #%v is not valid base64", i+1)
}
}
ret.Payloads[i] = &common.Payload{Data: in, Metadata: metadataForIndex}
}
return ret, nil
Expand Down
Loading