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

allow specifying auth style (#51233)

Browse Source
This commit is contained in:
Ieva 2022-06-30 10:27:31 +01:00 committed by GitHub
parent d429cac27b
commit 31e8e17d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/defaults.ini
View File

@ -576,6 +576,7 @@ tls_client_cert =
tls_client_key = tls_client_key =
tls_client_ca = tls_client_ca =
use_pkce = false use_pkce = false
auth_style =
#################################### Basic Auth ########################## #################################### Basic Auth ##########################
[auth.basic] [auth.basic]

1
conf/sample.ini
View File

@ -563,6 +563,7 @@
;tls_client_key = ;tls_client_key =
;tls_client_ca = ;tls_client_ca =
;use_pkce = false ;use_pkce = false
;auth_style =
#################################### Basic Auth ########################## #################################### Basic Auth ##########################
[auth.basic] [auth.basic]

15
pkg/login/social/social.go
View File

@ -105,13 +105,26 @@ func ProvideService(cfg *setting.Cfg) *SocialService {
ss.oAuthProvider[name] = info ss.oAuthProvider[name] = info
var authStyle oauth2.AuthStyle
switch strings.ToLower(sec.Key("auth_style").String()) {
case "inparams":
authStyle = oauth2.AuthStyleInParams
case "inheader":
authStyle = oauth2.AuthStyleInHeader
case "autodetect", "":
authStyle = oauth2.AuthStyleAutoDetect
default:
logger.Warn("Invalid auth style specified, defaulting to auth style AutoDetect", "auth_style", sec.Key("auth_style").String())
authStyle = oauth2.AuthStyleAutoDetect
}
config := oauth2.Config{ config := oauth2.Config{
ClientID: info.ClientId, ClientID: info.ClientId,
ClientSecret: info.ClientSecret, ClientSecret: info.ClientSecret,
Endpoint: oauth2.Endpoint{ Endpoint: oauth2.Endpoint{
AuthURL: info.AuthUrl, AuthURL: info.AuthUrl,
TokenURL: info.TokenUrl, TokenURL: info.TokenUrl,
AuthStyle: oauth2.AuthStyleAutoDetect, AuthStyle: authStyle,
}, },
RedirectURL: strings.TrimSuffix(cfg.AppURL, "/") + SocialBaseUrl + name, RedirectURL: strings.TrimSuffix(cfg.AppURL, "/") + SocialBaseUrl + name,
Scopes: info.Scopes, Scopes: info.Scopes,