Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions agent/a2aagent/a2a_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
itrace "trpc.group/trpc-go/trpc-agent-go/internal/trace"
"trpc.group/trpc-go/trpc-agent-go/log"
"trpc.group/trpc-go/trpc-agent-go/model"
"trpc.group/trpc-go/trpc-agent-go/platform"
semconvtrace "trpc.group/trpc-go/trpc-agent-go/telemetry/semconv/trace"
"trpc.group/trpc-go/trpc-agent-go/tool"
)
Expand Down Expand Up @@ -155,6 +156,7 @@ func (r *A2AAgent) sendErrorEvent(
err error,
) *model.ResponseError {
respErr := model.ResponseErrorFromError(err, model.ErrorTypeRunError)
redactAgentResponseError(respErr)
agent.EmitEvent(ctx, invocation, eventChan, event.New(
invocation.InvocationID,
r.name,
Expand All @@ -166,6 +168,17 @@ func (r *A2AAgent) sendErrorEvent(
return respErr
}

func redactAgentResponseError(respErr *model.ResponseError) {
if respErr == nil {
return
}
redactor, err := platform.NewRedactor()
if err != nil {
return
}
respErr.Message = redactor.Redact(respErr.Message)
}

// validateA2ARequestOptions validates that all A2A request options are of the correct type
func (r *A2AAgent) validateA2ARequestOptions(invocation *agent.Invocation) error {
if invocation.RunOptions.A2ARequestOptions == nil {
Expand Down
27 changes: 27 additions & 0 deletions agent/a2aagent/a2a_agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2914,6 +2914,33 @@ func TestA2AAgent_sendErrorEvent_UsesRunErrorType(t *testing.T) {
require.Equal(t, evt.Response.Error, respErr)
}

func TestA2AAgent_sendErrorEvent_RedactsSensitiveMessage(t *testing.T) {
a := &A2AAgent{name: "remote-agent"}
eventCh := make(chan *event.Event, 1)
invocation := &agent.Invocation{InvocationID: "inv-test"}

respErr := a.sendErrorEvent(
context.Background(),
eventCh,
invocation,
fmt.Errorf("request failed Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def"),
)

require.NotNil(t, respErr)
require.Equal(t, model.ErrorTypeRunError, respErr.Type)
for _, secret := range []string{"raw-token", "sk-1234567890abcdef", "session=abc", "sid=def"} {
require.NotContains(t, respErr.Message, secret)
}
for _, redacted := range []string{"Authorization: ****", "api_key=****", "Cookie: ****"} {
require.Contains(t, respErr.Message, redacted)
}

evt := <-eventCh
require.NotNil(t, evt)
require.NotNil(t, evt.Response)
require.Equal(t, respErr, evt.Response.Error)
}

func TestA2AAgent_aggregateEventContent_IgnoresErrorResponses(t *testing.T) {
a := &A2AAgent{name: "remote-agent"}
builder := &strings.Builder{}
Expand Down
Loading