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

SAML: graph api follow up (#89389)

Browse Source 
* add new graph api variables to saml strategy

* add  config variable
This commit is contained in:
linoman 2024-06-25 12:19:47 +02:00 committed by GitHub
parent 91628158f2
commit ccb22e5b24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/ssosettings/strategies/saml_strategy.go
View File

@ -63,6 +63,10 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
"role_values_grafana_admin": section.KeyValue("role_values_grafana_admin").MustString(""), "role_values_grafana_admin": section.KeyValue("role_values_grafana_admin").MustString(""),
"name_id_format": section.KeyValue("name_id_format").MustString(""), "name_id_format": section.KeyValue("name_id_format").MustString(""),
"skip_org_role_sync": section.KeyValue("skip_org_role_sync").MustBool(false), "skip_org_role_sync": section.KeyValue("skip_org_role_sync").MustBool(false),
"client_id": section.KeyValue("client_id").MustString(""),
"client_secret": section.KeyValue("client_secret").MustString(""),
"token_url": section.KeyValue("token_url").MustString(""),
"force_use_graph_api": section.KeyValue("force_use_graph_api").MustBool(false),
} }
return result return result
} }

8
pkg/services/ssosettings/strategies/saml_strategy_test.go
View File

@ -45,6 +45,10 @@ var (
name_id_format = urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress name_id_format = urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
skip_org_role_sync = false skip_org_role_sync = false
role_values_none = guest disabled role_values_none = guest disabled
token_url = http://localhost:8086/auth/realms/grafana/protocol/openid-connect/token
client_id = grafana
client_secret = grafana
force_use_graph_api = false
` `
expectedSAMLInfo = map[string]any{ expectedSAMLInfo = map[string]any{
@ -79,6 +83,10 @@ var (
"name_id_format": "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "name_id_format": "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
"skip_org_role_sync": false, "skip_org_role_sync": false,
"role_values_none": "guest disabled", "role_values_none": "guest disabled",
"token_url": "http://localhost:8086/auth/realms/grafana/protocol/openid-connect/token",
"client_id": "grafana",
"client_secret": "grafana",
"force_use_graph_api": false,
} }
) )