IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-02 12:17:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

OAuth: Forward id token to the data source (#42422)

Browse Source 
* OAuth: Forward id token to the data source

* Add tests

* Forward id token in legacy API

* Check if id_token is string or not
This commit is contained in:
Alexander Zobnin 2021-11-29 17:40:05 +03:00 committed by GitHub
parent 58978dcf96
commit becfd776c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/metrics.go
View File

@ -179,6 +179,11 @@ func (hs *HTTPServer) handleQueryData(ctx context.Context, user *models.SignedIn
if hs.OAuthTokenService.IsOAuthPassThruEnabled(ds) {
if token := hs.OAuthTokenService.GetCurrentOAuthToken(ctx, user); token != nil {
req.Headers["Authorization"] = fmt.Sprintf("%s %s", token.Type(), token.AccessToken)
idToken, ok := token.Extra("id_token").(string)
if ok && idToken != "" {
req.Headers["X-ID-Token"] = idToken
}
}
}

5
pkg/api/pluginproxy/ds_proxy.go
View File

@ -269,6 +269,11 @@ func (proxy *DataSourceProxy) director(req *http.Request) {
if proxy.oAuthTokenService.IsOAuthPassThruEnabled(proxy.ds) {
if token := proxy.oAuthTokenService.GetCurrentOAuthToken(proxy.ctx.Req.Context(), proxy.ctx.SignedInUser); token != nil {
req.Header.Set("Authorization", fmt.Sprintf("%s %s", token.Type(), token.AccessToken))
idToken, ok := token.Extra("id_token").(string)
if ok && idToken != "" {
req.Header.Set("X-ID-Token", idToken)
}
}
}
}

20
pkg/api/pluginproxy/ds_proxy_test.go
View File

@ -487,15 +487,22 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
SignedInUser: &models.SignedInUser{UserId: 1},
Context: &web.Context{Req: req},
}
token := &oauth2.Token{
AccessToken: "testtoken",
RefreshToken: "testrefreshtoken",
TokenType: "Bearer",
Expiry: time.Now().AddDate(0, 0, 1),
}
extra := map[string]interface{}{
"id_token": "testidtoken",
}
token = token.WithExtra(extra)
mockAuthToken := mockOAuthTokenService{
token: &oauth2.Token{
AccessToken: "testtoken",
RefreshToken: "testrefreshtoken",
TokenType: "Bearer",
Expiry: time.Now().AddDate(0, 0, 1),
},
token: token,
oAuthEnabled: true,
}
var routes []*plugins.Route
secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
dsService := datasources.ProvideService(bus.New(), nil, secretsService)
@ -507,6 +514,7 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
proxy.director(req)
assert.Equal(t, "Bearer testtoken", req.Header.Get("Authorization"))
assert.Equal(t, "testidtoken", req.Header.Get("X-ID-Token"))
})
t.Run("When SendUserHeader config is enabled", func(t *testing.T) {