mirror of
https://github.com/discourse/discourse.git
synced 2024-12-13 20:39:13 +08:00
821bb1e8cb
The 'Discourse SSO' protocol is being rebranded to DiscourseConnect. This should help to reduce confusion when 'SSO' is used in the generic sense. This commit aims to: - Rename `sso_` site settings. DiscourseConnect specific ones are prefixed `discourse_connect_`. Generic settings are prefixed `auth_` - Add (server-side-only) backwards compatibility for the old setting names, with deprecation notices - Copy `site_settings` database records to the new names - Rename relevant translation keys - Update relevant translations This commit does **not** aim to: - Rename any Ruby classes or methods. This might be done in a future commit - Change any URLs. This would break existing integrations - Make any changes to the protocol. This would break existing integrations - Change any functionality. Further normalization across DiscourseConnect and other auth methods will be done separately The risks are: - There is no backwards compatibility for site settings on the client-side. Accessing auth-related site settings in Javascript is fairly rare, and an error on the client side would not be security-critical. - If a plugin is monkey-patching parts of the auth process, changes to locale keys could cause broken error messages. This should also be unlikely. The old site setting names remain functional, so security-related overrides will remain working. A follow-up commit will be made with a post-deploy migration to delete the old `site_settings` rows.
41 lines
1.3 KiB
Ruby
41 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class SingleSignOnProvider < SingleSignOn
|
|
class BlankSecret < RuntimeError; end
|
|
|
|
def self.parse(payload, sso_secret = nil)
|
|
set_return_sso_url(payload)
|
|
if sso_secret.blank? && self.sso_secret.blank?
|
|
host = URI.parse(@return_sso_url).host
|
|
Rails.logger.warn("SSO failed; website #{host} is not in the `discourse_connect_provider_secrets` site settings")
|
|
raise BlankSecret
|
|
end
|
|
|
|
super
|
|
end
|
|
|
|
def self.set_return_sso_url(payload)
|
|
parsed = Rack::Utils.parse_query(payload)
|
|
decoded = Base64.decode64(parsed["sso"])
|
|
decoded_hash = Rack::Utils.parse_query(decoded)
|
|
|
|
raise ParseError unless decoded_hash.key? 'return_sso_url'
|
|
@return_sso_url = decoded_hash['return_sso_url']
|
|
end
|
|
|
|
def self.sso_secret
|
|
return nil unless @return_sso_url && SiteSetting.enable_discourse_connect_provider
|
|
|
|
provider_secrets = SiteSetting.discourse_connect_provider_secrets.split(/[|\n]/)
|
|
provider_secrets_hash = Hash[*provider_secrets]
|
|
return_url_host = URI.parse(@return_sso_url).host
|
|
# moves wildcard domains to the end of hash
|
|
sorted_secrets = provider_secrets_hash.sort_by { |k, _| k }.reverse.to_h
|
|
|
|
secret = sorted_secrets.select do |domain, _|
|
|
WildcardDomainChecker.check_domain(domain, return_url_host)
|
|
end
|
|
secret.present? ? secret.values.first : nil
|
|
end
|
|
end
|