IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Datasource Loki: preserve header X-ID-Token (#57878)

Browse Source
This commit is contained in:
Si Mon 2022-11-07 16:53:42 +01:00 committed by GitHub
parent 89eba7a108
commit bc280d0749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/tsdb/loki/auth_test.go
View File

@ -53,7 +53,7 @@ func TestOauthForwardIdentity(t *testing.T) {
auth bool
cookie bool
}{
{name: "when auth header exists => add auth header", auth: true, cookie: false},
{name: "when auth headers exist => add auth headers", auth: true, cookie: false},
{name: "when cookie header exists => add cookie header", auth: false, cookie: true},
{name: "when cookie&auth headers exist => add cookie&auth headers", auth: true, cookie: true},
{name: "when no header exists => do not add headers", auth: false, cookie: false},
@ -63,6 +63,8 @@ func TestOauthForwardIdentity(t *testing.T) {
authValue := "auth"
cookieName := "Cookie"
cookieValue := "a=1"
idTokenName := "X-ID-Token"
idTokenValue := "idtoken"
for _, test := range tt {
t.Run("QueryData: "+test.name, func(t *testing.T) {
@ -91,10 +93,13 @@ func TestOauthForwardIdentity(t *testing.T) {
// as an array
authValues := req.Header.Values(authName)
cookieValues := req.Header.Values(cookieName)
idTokenValues := req.Header.Values(idTokenName)
if test.auth {
require.Equal(t, []string{authValue}, authValues)
require.Equal(t, []string{idTokenValue}, idTokenValues)
} else {
require.Len(t, authValues, 0)
require.Len(t, idTokenValues, 0)
}
if test.cookie {
require.Equal(t, []string{cookieValue}, cookieValues)
@ -115,6 +120,7 @@ func TestOauthForwardIdentity(t *testing.T) {
if test.auth {
req.Headers[authName] = authValue
req.Headers[idTokenName] = idTokenValue
}
if test.cookie {
@ -146,13 +152,16 @@ func TestOauthForwardIdentity(t *testing.T) {
clientUsed = true
authValues := req.Header.Values(authName)
cookieValues := req.Header.Values(cookieName)
idTokenValues := req.Header.Values(idTokenName)
// we need to check for "header does not exist",
// and the only way i can find is to get the values
// as an array
if test.auth {
require.Equal(t, []string{authValue}, authValues)
require.Equal(t, []string{idTokenValue}, idTokenValues)
} else {
require.Len(t, authValues, 0)
require.Len(t, idTokenValues, 0)
}
if test.cookie {
require.Equal(t, []string{cookieValue}, cookieValues)
@ -169,6 +178,7 @@ func TestOauthForwardIdentity(t *testing.T) {
if test.auth {
req.Headers[authName] = []string{authValue}
req.Headers[idTokenName] = []string{idTokenValue}
}
if test.cookie {
req.Headers[cookieName] = []string{cookieValue}

4
pkg/tsdb/loki/loki.go
View File

@ -130,6 +130,10 @@ func getAuthHeadersForCallResource(headers map[string][]string) map[string]strin
data["Cookie"] = cookie
}
if idToken := arrayHeaderFirstValue(headers["X-ID-Token"]); idToken != "" {
data["X-ID-Token"] = idToken
}
return data
}