opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 03:12:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Implement requester in util pkg (#74105)

Browse Source 
implement requester changes that do not impact functionality
This commit is contained in:
Jo
2023-08-31 09:46:55 +02:00
committed by GitHub
parent f97e1c81e6
commit dcf06658eb
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/util/proxyutil/proxyutil.go
View File

@ -7,7 +7,7 @@ import (
"sort"
"strings"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/services/auth/identity"
)
// UserHeaderName name of the header used when forwarding the Grafana user login.
@ -103,9 +103,16 @@ func SetViaHeader(header http.Header, major, minor int) {
}
// ApplyUserHeader Set the X-Grafana-User header if needed (and remove if not).
func ApplyUserHeader(sendUserHeader bool, req *http.Request, user *user.SignedInUser) {
func ApplyUserHeader(sendUserHeader bool, req *http.Request, user identity.Requester) {
req.Header.Del(UserHeaderName)
if sendUserHeader && user != nil && !user.IsAnonymous {
req.Header.Set(UserHeaderName, user.Login)
if !sendUserHeader || user == nil || user.IsNil() {
return
}
namespace, _ := user.GetNamespacedID()
switch namespace {
case identity.NamespaceUser, identity.NamespaceServiceAccount:
req.Header.Set(UserHeaderName, user.GetLogin())
}
}