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

SSO: Add the new role value fields for SSO SAML strategy (#88561)

Browse Source 
added the new role value fields for SSO SAML strategy
This commit is contained in:
Mihai Doarna 2024-06-04 15:47:27 +03:00 committed by GitHub
parent 6b7e4b223d
commit 25c57f21cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,12 +56,13 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
"assertion_attribute_org": section.KeyValue("assertion_attribute_org").MustString(""),
"allowed_organizations": section.KeyValue("allowed_organizations").MustString(""),
"org_mapping": section.KeyValue("org_mapping").MustString(""),
"role_values_none": section.KeyValue("role_values_none").MustString(""),
"role_values_viewer": section.KeyValue("role_values_viewer").MustString(""),
"role_values_editor": section.KeyValue("role_values_editor").MustString(""),
"role_values_admin": section.KeyValue("role_values_admin").MustString(""),
"role_values_grafana_admin": section.KeyValue("role_values_grafana_admin").MustString(""),
"name_id_format": section.KeyValue("name_id_format").MustString(""),
"skip_org_role_sync": section.KeyValue("skip_org_role_sync").MustBool(false),
"role_values_none": section.KeyValue("role_values_none").MustString(""),
}
return result
}

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

@ -38,6 +38,7 @@ var (
assertion_attribute_org = orgs
allowed_organizations = org1 org2
org_mapping = org1:1:editor, *:2:viewer
role_values_viewer = viewer
role_values_editor = editor
role_values_admin = admin
role_values_grafana_admin = serveradmin
@ -71,6 +72,7 @@ var (
"assertion_attribute_org": "orgs",
"allowed_organizations": "org1 org2",
"org_mapping": "org1:1:editor, *:2:viewer",
"role_values_viewer": "viewer",
"role_values_editor": "editor",
"role_values_admin": "admin",
"role_values_grafana_admin": "serveradmin",