github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-22 01:40:39 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

FIX: support comma in 'sso_provider_secrets' site setting

Browse Source
This commit is contained in:
Régis Hanol 2018-10-24 21:23:18 +02:00
parent 05438d99a8
commit addf6f6d17
2 changed files with 7 additions and 2 deletions

2
lib/single_sign_on.rb

@ -89,7 +89,7 @@ class SingleSignOn
end end
def self.provider_secret(return_sso_url) def self.provider_secret(return_sso_url)
provider_secrets = SiteSetting.sso_provider_secrets.split(/[\|,\n]/) provider_secrets = SiteSetting.sso_provider_secrets.split(/[|\n]/)
provider_secrets_hash = Hash[*provider_secrets] provider_secrets_hash = Hash[*provider_secrets]
return_url_host = URI.parse(return_sso_url).host return_url_host = URI.parse(return_sso_url).host
# moves wildcard domains to the end of hash # moves wildcard domains to the end of hash

7
spec/requests/session_controller_spec.rb

@ -589,7 +589,12 @@ RSpec.describe SessionController do
SiteSetting.enable_sso_provider = true SiteSetting.enable_sso_provider = true
SiteSetting.enable_sso = false SiteSetting.enable_sso = false
SiteSetting.enable_local_logins = true SiteSetting.enable_local_logins = true
SiteSetting.sso_provider_secrets = "*|secretforAll\n*.rainbow|wrongSecretForOverRainbow\nwww.random.site|secretForRandomSite\nsomewhere.over.rainbow|secretForOverRainbow" SiteSetting.sso_provider_secrets = [
"*|secret,forAll",
"*.rainbow|wrongSecretForOverRainbow",
"www.random.site|secretForRandomSite",
"somewhere.over.rainbow|secretForOverRainbow",
].join("\n")
@sso = SingleSignOn.new @sso = SingleSignOn.new
@sso.nonce = "mynonce" @sso.nonce = "mynonce"