IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Sign sigV4 request after adding headers (#87063)

Browse Source
This commit is contained in:
Isabella Siu
2024-04-29 13:07:45 -04:00
committed by GitHub
parent b679a32fad
commit 7b392d40a0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/infra/httpclient/httpclientprovider/http_client_provider.go
View File

@@ -32,10 +32,6 @@ func New(cfg *setting.Cfg, validator validations.PluginRequestValidator, tracer
RedirectLimitMiddleware(validator),
}
if cfg.SigV4AuthEnabled {
middlewares = append(middlewares, awssdk.SigV4Middleware(cfg.SigV4VerboseLogging))
}
if httpLoggingEnabled(cfg.PluginSettings) {
middlewares = append(middlewares, HTTPLoggerMiddleware(cfg.PluginSettings))
}
@@ -44,6 +40,11 @@ func New(cfg *setting.Cfg, validator validations.PluginRequestValidator, tracer
middlewares = append(middlewares, GrafanaRequestIDHeaderMiddleware(cfg, logger))
}
// SigV4 signing should be performed after all headers are added
if cfg.SigV4AuthEnabled {
middlewares = append(middlewares, awssdk.SigV4Middleware(cfg.SigV4VerboseLogging))
}
setDefaultTimeoutOptions(cfg)
return newProviderFunc(sdkhttpclient.ProviderOptions{