Skip to content

refactor: replace pre-built SigV4 body signing with lazy BodySigner closure passed through request handlers #4735

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
Pratham-Mishra04 merged 1 commit into from
Jun 27, 2026
Merged

refactor: replace pre-built SigV4 body signing with lazy BodySigner closure passed through request handlers #4735

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
55 changes: 51 additions & 4 deletions core/providers/anthropic/anthropic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ func completeRequest(
betaHeaderOverrides map[string]bool,
providerName schemas.ModelProvider,
requestType schemas.RequestType,
signer providerUtils.BodySigner,
logger schemas.Logger,
) ([]byte, time.Duration, map[string]string, *schemas.BifrostError) {
req := fasthttp.AcquireRequest()
Expand Down Expand Up @@ -238,6 +239,18 @@ func completeRequest(

usedLargePayloadBody := setAnthropicRequestBody(ctx, req, jsonBody)

// Sign the exact body bytes set on the request, when a signer is supplied (e.g. AWS SigV4
// for Bedrock Mantle). Done after the body is set so the signature covers what is actually sent.
if signer != nil {
sigHeaders, bErr := signer(jsonBody)
Comment thread
Pratham-Mishra04 marked this conversation as resolved.
if bErr != nil {
return nil, 0, nil, bErr
Comment thread
Pratham-Mishra04 marked this conversation as resolved.
}
for k, v := range sigHeaders {
req.Header.Set(k, v)
}
}

requestClient := client
responseThreshold, _ := ctx.Value(schemas.BifrostContextKeyLargeResponseThreshold).(int64)
isCountTokens := requestType == schemas.CountTokensRequest
Expand Down Expand Up @@ -390,7 +403,7 @@ func (provider *AnthropicProvider) TextCompletion(ctx *schemas.BifrostContext, k
}

// Use struct directly for JSON marshaling (no beta headers for text completion)
responseBody, latency, providerResponseHeaders, err := completeRequest(ctx, provider.client, provider.buildRequestURL(ctx, "/v1/complete", schemas.TextCompletionRequest), jsonData, provider.anthropicRequestHeaders(ctx, key), provider.networkConfig.ExtraHeaders, provider.networkConfig.BetaHeaderOverrides, provider.GetProviderKey(), schemas.TextCompletionRequest, provider.logger)
responseBody, latency, providerResponseHeaders, err := completeRequest(ctx, provider.client, provider.buildRequestURL(ctx, "/v1/complete", schemas.TextCompletionRequest), jsonData, provider.anthropicRequestHeaders(ctx, key), provider.networkConfig.ExtraHeaders, provider.networkConfig.BetaHeaderOverrides, provider.GetProviderKey(), schemas.TextCompletionRequest, nil, provider.logger)
if providerResponseHeaders != nil {
ctx.SetValue(schemas.BifrostContextKeyProviderResponseHeaders, providerResponseHeaders)
}
Expand Down Expand Up @@ -465,6 +478,7 @@ func (provider *AnthropicProvider) ChatCompletion(ctx *schemas.BifrostContext, k
},
provider.anthropicRequestHeaders(ctx, key),
provider.networkConfig.ExtraHeaders,
nil,
provider.logger,
)
}
Expand All @@ -484,6 +498,7 @@ func HandleAnthropicChatCompletionRequest(
config AnthropicRequestBuildConfig,
headers map[string]string,
extraHeaders map[string]string,
signer providerUtils.BodySigner,
logger schemas.Logger,
) (*schemas.BifrostChatResponse, *schemas.BifrostError) {
jsonBody, bifrostErr := BuildAnthropicChatRequestBody(ctx, request, config)
Expand All @@ -492,7 +507,7 @@ func HandleAnthropicChatCompletionRequest(
}

// Use struct directly for JSON marshaling
responseBody, latency, providerResponseHeaders, bifrostErr := completeRequest(ctx, client, url, jsonBody, headers, extraHeaders, config.BetaHeaderOverrides, config.Provider, schemas.ChatCompletionRequest, logger)
responseBody, latency, providerResponseHeaders, bifrostErr := completeRequest(ctx, client, url, jsonBody, headers, extraHeaders, config.BetaHeaderOverrides, config.Provider, schemas.ChatCompletionRequest, signer, logger)
if providerResponseHeaders != nil {
ctx.SetValue(schemas.BifrostContextKeyProviderResponseHeaders, providerResponseHeaders)
}
Expand Down Expand Up @@ -581,6 +596,7 @@ func (provider *AnthropicProvider) ChatCompletionStream(ctx *schemas.BifrostCont
provider.GetProviderKey(),
postHookRunner,
nil,
nil,
provider.logger,
postHookSpanFinalizer,
)
Expand Down Expand Up @@ -616,6 +632,7 @@ func HandleAnthropicChatCompletionStreaming(
providerName schemas.ModelProvider,
postHookRunner schemas.PostHookRunner,
postResponseConverter func(*schemas.BifrostChatResponse) *schemas.BifrostChatResponse,
signer providerUtils.BodySigner,
logger schemas.Logger,
postHookSpanFinalizer func(context.Context),
) (chan *schemas.BifrostStreamChunk, *schemas.BifrostError) {
Expand Down Expand Up @@ -643,6 +660,19 @@ func HandleAnthropicChatCompletionStreaming(

usedLargePayloadBody := setAnthropicRequestBody(ctx, req, jsonBody)

// Sign the exact body bytes set on the request, when a signer is supplied (e.g. AWS SigV4
// for Bedrock Mantle). Done after the body is set so the signature covers what is actually sent.
if signer != nil {
sigHeaders, bErr := signer(jsonBody)
if bErr != nil {
defer providerUtils.ReleaseStreamingResponse(ctx, resp)
return nil, bErr
}
for k, v := range sigHeaders {
req.Header.Set(k, v)
}
}

// Close the connection after this streaming response instead of returning it to
// the keep-alive pool. fasthttp can otherwise reuse a streaming connection whose
// reader is still in a torn state (body not fully drained, or the idle-timeout/
Expand Down Expand Up @@ -1025,6 +1055,7 @@ func (provider *AnthropicProvider) Responses(ctx *schemas.BifrostContext, key sc
},
provider.anthropicRequestHeaders(ctx, key),
provider.networkConfig.ExtraHeaders,
nil,
provider.logger,
)
}
Expand All @@ -1041,14 +1072,15 @@ func HandleAnthropicResponsesRequest(
config AnthropicRequestBuildConfig,
headers map[string]string,
extraHeaders map[string]string,
signer providerUtils.BodySigner,
logger schemas.Logger,
) (*schemas.BifrostResponsesResponse, *schemas.BifrostError) {
jsonBody, bifrostErr := BuildAnthropicResponsesRequestBody(ctx, request, config)
if bifrostErr != nil {
return nil, bifrostErr
}

responseBody, latency, providerResponseHeaders, bifrostErr := completeRequest(ctx, client, url, jsonBody, headers, extraHeaders, config.BetaHeaderOverrides, config.Provider, schemas.ResponsesRequest, logger)
responseBody, latency, providerResponseHeaders, bifrostErr := completeRequest(ctx, client, url, jsonBody, headers, extraHeaders, config.BetaHeaderOverrides, config.Provider, schemas.ResponsesRequest, signer, logger)
if providerResponseHeaders != nil {
ctx.SetValue(schemas.BifrostContextKeyProviderResponseHeaders, providerResponseHeaders)
}
Expand Down Expand Up @@ -1140,6 +1172,7 @@ func (provider *AnthropicProvider) ResponsesStream(ctx *schemas.BifrostContext,
provider.GetProviderKey(),
postHookRunner,
nil,
nil,
provider.logger,
postHookSpanFinalizer,
)
Expand All @@ -1161,6 +1194,7 @@ func HandleAnthropicResponsesStream(
providerName schemas.ModelProvider,
postHookRunner schemas.PostHookRunner,
postResponseConverter func(*schemas.BifrostResponsesStreamResponse) *schemas.BifrostResponsesStreamResponse,
signer providerUtils.BodySigner,
logger schemas.Logger,
postHookSpanFinalizer func(context.Context),
) (chan *schemas.BifrostStreamChunk, *schemas.BifrostError) {
Expand Down Expand Up @@ -1190,6 +1224,19 @@ func HandleAnthropicResponsesStream(
// Set body
usedLargePayloadBody := setAnthropicRequestBody(ctx, req, jsonBody)

// Sign the exact body bytes set on the request, when a signer is supplied (e.g. AWS SigV4
// for Bedrock Mantle). Done after the body is set so the signature covers what is actually sent.
if signer != nil {
sigHeaders, bErr := signer(jsonBody)
if bErr != nil {
defer providerUtils.ReleaseStreamingResponse(ctx, resp)
return nil, bErr
}
for k, v := range sigHeaders {
req.Header.Set(k, v)
}
}

// Close the connection after this streaming response instead of returning it to
// the keep-alive pool. fasthttp can otherwise reuse a streaming connection whose
// reader is still in a torn state (body not fully drained, or the idle-timeout/
Expand Down Expand Up @@ -2563,7 +2610,7 @@ func (provider *AnthropicProvider) CountTokens(ctx *schemas.BifrostContext, key
return nil, err
}

responseBody, latency, providerResponseHeaders, bifrostErr := completeRequest(ctx, provider.client, provider.buildRequestURL(ctx, "/v1/messages/count_tokens", schemas.CountTokensRequest), jsonBody, provider.anthropicRequestHeaders(ctx, key), provider.networkConfig.ExtraHeaders, provider.networkConfig.BetaHeaderOverrides, provider.GetProviderKey(), schemas.CountTokensRequest, provider.logger)
responseBody, latency, providerResponseHeaders, bifrostErr := completeRequest(ctx, provider.client, provider.buildRequestURL(ctx, "/v1/messages/count_tokens", schemas.CountTokensRequest), jsonBody, provider.anthropicRequestHeaders(ctx, key), provider.networkConfig.ExtraHeaders, provider.networkConfig.BetaHeaderOverrides, provider.GetProviderKey(), schemas.CountTokensRequest, nil, provider.logger)
if providerResponseHeaders != nil {
ctx.SetValue(schemas.BifrostContextKeyProviderResponseHeaders, providerResponseHeaders)
}
Expand Down
8 changes: 8 additions & 0 deletions core/providers/azure/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ func (provider *AzureProvider) ChatCompletion(ctx *schemas.BifrostContext, key s
},
authHeader,
provider.networkConfig.ExtraHeaders,
nil,
provider.logger,
)
}
Expand All @@ -414,6 +415,7 @@ func (provider *AzureProvider) ChatCompletion(ctx *schemas.BifrostContext, key s
provider.GetProviderKey(),
nil,
nil,
nil,
provider.logger,
)
}
Expand Down Expand Up @@ -462,6 +464,7 @@ func (provider *AzureProvider) ChatCompletionStream(ctx *schemas.BifrostContext,
provider.GetProviderKey(),
postHookRunner,
nil,
nil,
provider.logger,
postHookSpanFinalizer,
)
Expand Down Expand Up @@ -490,6 +493,7 @@ func (provider *AzureProvider) ChatCompletionStream(ctx *schemas.BifrostContext,
nil,
nil,
nil,
nil,
provider.logger,
postHookSpanFinalizer,
)
Expand Down Expand Up @@ -528,6 +532,7 @@ func (provider *AzureProvider) Responses(ctx *schemas.BifrostContext, key schema
},
authHeader,
provider.networkConfig.ExtraHeaders,
nil,
provider.logger,
)
}
Expand All @@ -550,6 +555,7 @@ func (provider *AzureProvider) Responses(ctx *schemas.BifrostContext, key schema
provider.GetProviderKey(),
nil,
nil,
nil,
provider.logger,
)
}
Expand Down Expand Up @@ -596,6 +602,7 @@ func (provider *AzureProvider) ResponsesStream(ctx *schemas.BifrostContext, post
provider.GetProviderKey(),
postHookRunner,
nil,
nil,
provider.logger,
postHookSpanFinalizer,
)
Expand Down Expand Up @@ -623,6 +630,7 @@ func (provider *AzureProvider) ResponsesStream(ctx *schemas.BifrostContext, post
nil,
nil,
nil,
nil,
provider.logger,
postHookSpanFinalizer,
)
Expand Down
Loading
Loading