public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auth: Add missing Name property to SAML strategy (#94565)

Browse Source 
Add Name to SAML strategy
This commit is contained in:
Misi
2024-10-11 08:45:36 +02:00
committed by GitHub
parent f8748f0724
commit 4eab10eaa1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ssosettings/strategies/saml_strategy.go
+1
View File
@@ -33,6 +33,7 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
section := s.settingsProvider.Section("auth.saml") section := s.settingsProvider.Section("auth.saml")
result := map[string]any{ result := map[string]any{
"enabled": section.KeyValue("enabled").MustBool(false), "enabled": section.KeyValue("enabled").MustBool(false),
"name": section.KeyValue("name").MustString("SAML"),
"single_logout": section.KeyValue("single_logout").MustBool(false), "single_logout": section.KeyValue("single_logout").MustBool(false),
"allow_sign_up": section.KeyValue("allow_sign_up").MustBool(false), "allow_sign_up": section.KeyValue("allow_sign_up").MustBool(false),
"auto_login": section.KeyValue("auto_login").MustBool(false), "auto_login": section.KeyValue("auto_login").MustBool(false),
pkg/services/ssosettings/strategies/saml_strategy_test.go
+4 -2
View File
@@ -16,8 +16,9 @@ var (
[auth.saml] [auth.saml]
enabled = true enabled = true
single_logout = true single_logout = true
name = "SAML Test"
allow_sign_up = true allow_sign_up = true
auto_login = false auto_login = true
certificate = devenv/docker/blocks/auth/saml-enterprise/cert.crt certificate = devenv/docker/blocks/auth/saml-enterprise/cert.crt
certificate_path = /path/to/cert certificate_path = /path/to/cert
private_key = dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0 private_key = dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0
@@ -55,7 +56,8 @@ var (
"enabled": true, "enabled": true,
"single_logout": true, "single_logout": true,
"allow_sign_up": true, "allow_sign_up": true,
"auto_login": false, "auto_login": true,
"name": "SAML Test",
"certificate": "devenv/docker/blocks/auth/saml-enterprise/cert.crt", "certificate": "devenv/docker/blocks/auth/saml-enterprise/cert.crt",
"certificate_path": "/path/to/cert", "certificate_path": "/path/to/cert",
"private_key": "dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0", "private_key": "dGhpcyBpcyBteSBwcml2YXRlIGtleSB0aGF0IEkgd2FudCB0byBnZXQgZW5jb2RlZCBpbiBiYXNlIDY0",