* Contexthandler: Add uname as response header (#59930)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 1b676d0d49)
* fixes tests broken due to moved featuremgt package
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
This commit is contained in:
@@ -22,6 +22,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/services/apikey"
|
||||
"github.com/grafana/grafana/pkg/services/contexthandler/authproxy"
|
||||
"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
"github.com/grafana/grafana/pkg/services/login"
|
||||
"github.com/grafana/grafana/pkg/services/org"
|
||||
"github.com/grafana/grafana/pkg/services/rendering"
|
||||
@@ -172,6 +173,11 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
|
||||
}
|
||||
}
|
||||
|
||||
// this can be used by proxies to identify certain users
|
||||
if h.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagReturnUnameHeader) {
|
||||
w.Header().Add("grafana-uname", reqContext.Login)
|
||||
}
|
||||
|
||||
next.ServeHTTP(w, r)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -9,6 +9,11 @@ package featuremgmt
|
||||
var (
|
||||
// Register each toggle here
|
||||
standardFeatureFlags = []FeatureFlag{
|
||||
{
|
||||
Name: "returnUnameHeader",
|
||||
Description: "Return user login as header for authenticated requests",
|
||||
State: FeatureStateAlpha,
|
||||
},
|
||||
{
|
||||
Name: "trimDefaults",
|
||||
Description: "Use cue schema to remove values that will be applied automatically",
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
package featuremgmt
|
||||
|
||||
const (
|
||||
// FlagReturnUnameHeader
|
||||
// Return user login as header for authenticated requests
|
||||
FlagReturnUnameHeader = "returnUnameHeader"
|
||||
|
||||
// FlagTrimDefaults
|
||||
// Use cue schema to remove values that will be applied automatically
|
||||
FlagTrimDefaults = "trimDefaults"
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"allowUnsanitizedSvgUpload": false,
|
||||
"addDevEnv": true,
|
||||
"roots": null
|
||||
}
|
||||
Reference in New Issue
Block a user