Skip to content

fix(secrets): swap a match_body secret after another one misses #281

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

Open
kvdb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(secrets): swap a match_body secret after another one misses #281

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
2 changes: 2 additions & 0 deletions internal/transform/secrets/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,8 @@ func (s *Secrets) swapBody(req *http.Request, sec *resolvedSecret, realValue str
}

if !bytes.Contains(data, []byte(sec.proxyValue)) {
// Put the body back so the next body-matching secret can read it.
req.Body = transform.NewBufferedBodyFromBytes(data)
return ""
}

Expand Down
25 changes: 25 additions & 0 deletions internal/transform/secrets/secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,31 @@ func TestSecrets_BodySwap(t *testing.T) {
require.Contains(t, string(result), `"model": "gpt-4"`)
}

func TestSecrets_BodySwapAfterAbsentBodySecret(t *testing.T) {
// The first body secret's placeholder is not in the request.
s := makeSecrets(t, []secretEntry{
defaultEntry(func(e *secretEntry) {
e.Source = envSource("ANTHROPIC_API_KEY")
e.ProxyValue = "proxy-anthropic-xyz789"
e.MatchHeaders = nil
e.MatchBody = true
}),
defaultEntry(func(e *secretEntry) {
e.MatchHeaders = nil
e.MatchBody = true
}),
})

req := openaiReq("POST", "/v1/chat")
req.Body = transform.NewBufferedBody(io.NopCloser(strings.NewReader(`{"api_key": "proxy-openai-abc123"}`)), 1<<20)

doTransform(t, s, req)

result, err := io.ReadAll(req.Body)
require.NoError(t, err)
require.Equal(t, `{"api_key": "sk-real-openai-key"}`, string(result))
}

func TestSecrets_HostMatch(t *testing.T) {
s := makeSecrets(t, []secretEntry{defaultEntry()})

Expand Down