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

IP range AC: Add X-Real-IP header (#82390)

Browse Source 
add X-Real-IP header
This commit is contained in:
Ieva 2024-02-14 11:45:55 +00:00 committed by GitHub
parent fe795417f7
commit 7c44dd713a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware.go
View File

@ -19,6 +19,7 @@ import (
const GrafanaRequestID = "X-Grafana-Request-Id" const GrafanaRequestID = "X-Grafana-Request-Id"
const GrafanaSignedRequestID = "X-Grafana-Signed-Request-Id" const GrafanaSignedRequestID = "X-Grafana-Signed-Request-Id"
const XRealIPHeader = "X-Real-Ip"
const GrafanaInternalRequest = "X-Grafana-Internal-Request" const GrafanaInternalRequest = "X-Grafana-Internal-Request"
// NewHostedGrafanaACHeaderMiddleware creates a new plugins.ClientMiddleware that will // NewHostedGrafanaACHeaderMiddleware creates a new plugins.ClientMiddleware that will
@ -83,6 +84,7 @@ func (m *HostedGrafanaACHeaderMiddleware) applyGrafanaRequestIDHeader(ctx contex
if reqCtx != nil && reqCtx.Req != nil { if reqCtx != nil && reqCtx.Req != nil {
remoteAddress := web.RemoteAddr(reqCtx.Req) remoteAddress := web.RemoteAddr(reqCtx.Req)
if remoteAddress != "" { if remoteAddress != "" {
h.SetHTTPHeader(XRealIPHeader, remoteAddress)
return return
} }
} }

3
pkg/services/pluginsintegration/clientmiddleware/grafana_request_id_header_middleware_test.go
View File

@ -54,6 +54,9 @@ func Test_HostedGrafanaACHeaderMiddleware(t *testing.T) {
require.Equal(t, cdt.CallResourceReq.Headers[GrafanaSignedRequestID][0], computed) require.Equal(t, cdt.CallResourceReq.Headers[GrafanaSignedRequestID][0], computed)
require.Len(t, cdt.CallResourceReq.Headers[XRealIPHeader], 1)
require.Equal(t, cdt.CallResourceReq.Headers[XRealIPHeader][0], "1.2.3.4")
// Internal header should not be set // Internal header should not be set
require.Len(t, cdt.CallResourceReq.Headers[GrafanaInternalRequest], 0) require.Len(t, cdt.CallResourceReq.Headers[GrafanaInternalRequest], 0)
}) })