github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 22:27:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: allow multiple secrets for Discourse SSO provider

Browse Source 
This splits off the logic between SSO keys used incoming vs outgoing, it allows to far better restrict who is allowed to log in using a site.

This allows for better auditing of the SSO provider feature
This commit is contained in:
Maja Komel
2018-10-15 07:03:53 +02:00
committed by Sam
parent 6acdea37c4
commit 27e732a58d
15 changed files with 459 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/site_setting_extension.rb
View File

@ -220,7 +220,8 @@ module SiteSettingExtension
value: value.to_s,
category: categories[s],
preview: previews[s],
secret: secret_settings.include?(s)
secret: secret_settings.include?(s),
placeholder: placeholder(s)
}.merge(type_supervisor.type_hash(s))
opts
@ -231,6 +232,12 @@ module SiteSettingExtension
I18n.t("site_settings.#{setting}")
end
def placeholder(setting)
if !I18n.t("site_settings.placeholder.#{setting}", default: "").empty?
I18n.t("site_settings.placeholder.#{setting}")
end
end
def self.client_settings_cache_key
# NOTE: we use the git version in the key to ensure
# that we don't end up caching the incorrect version