gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-07-15 08:48:15 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Use config_for for omniauth enabled values (#35015)

Browse Source
This commit is contained in:
Matt Jankowski 2025-06-24 05:32:13 -04:00 committed by GitHub
parent 8ee8231a43
commit fd902c04f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -98,7 +98,7 @@ class ApplicationController < ActionController::Base
end end
def after_sign_out_path_for(_resource_or_scope) def after_sign_out_path_for(_resource_or_scope)
if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true' if ENV['OMNIAUTH_ONLY'] == 'true' && Rails.configuration.x.omniauth.oidc_enabled?
'/auth/auth/openid_connect/logout' '/auth/auth/openid_connect/logout'
else else
new_user_session_path new_user_session_path

1
config/application.rb
View File

@ -106,6 +106,7 @@ module Mastodon
config.x.cache_buster = config_for(:cache_buster) config.x.cache_buster = config_for(:cache_buster)
config.x.captcha = config_for(:captcha) config.x.captcha = config_for(:captcha)
config.x.mastodon = config_for(:mastodon) config.x.mastodon = config_for(:mastodon)
config.x.omniauth = config_for(:omniauth)
config.x.translation = config_for(:translation) config.x.translation = config_for(:translation)
config.x.vapid = config_for(:vapid) config.x.vapid = config_for(:vapid)

6
config/initializers/3_omniauth.rb
View File

@ -10,7 +10,7 @@ end
Devise.setup do |config| Devise.setup do |config|
# CAS strategy # CAS strategy
if ENV['CAS_ENABLED'] == 'true' if Rails.configuration.x.omniauth.cas_enabled?
cas_options = {} cas_options = {}
cas_options[:display_name] = ENV.fetch('CAS_DISPLAY_NAME', nil) cas_options[:display_name] = ENV.fetch('CAS_DISPLAY_NAME', nil)
cas_options[:url] = ENV['CAS_URL'] if ENV['CAS_URL'] cas_options[:url] = ENV['CAS_URL'] if ENV['CAS_URL']
@ -39,7 +39,7 @@ Devise.setup do |config|
end end
# SAML strategy # SAML strategy
if ENV['SAML_ENABLED'] == 'true' if Rails.configuration.x.omniauth.saml_enabled?
saml_options = {} saml_options = {}
saml_options[:display_name] = ENV.fetch('SAML_DISPLAY_NAME', nil) saml_options[:display_name] = ENV.fetch('SAML_DISPLAY_NAME', nil)
saml_options[:assertion_consumer_service_url] = ENV['SAML_ACS_URL'] if ENV['SAML_ACS_URL'] saml_options[:assertion_consumer_service_url] = ENV['SAML_ACS_URL'] if ENV['SAML_ACS_URL']
@ -71,7 +71,7 @@ Devise.setup do |config|
end end
# OpenID Connect Strategy # OpenID Connect Strategy
if ENV['OIDC_ENABLED'] == 'true' if Rails.configuration.x.omniauth.oidc_enabled?
oidc_options = {} oidc_options = {}
oidc_options[:display_name] = ENV.fetch('OIDC_DISPLAY_NAME', nil) # OPTIONAL oidc_options[:display_name] = ENV.fetch('OIDC_DISPLAY_NAME', nil) # OPTIONAL
oidc_options[:issuer] = ENV['OIDC_ISSUER'] if ENV['OIDC_ISSUER'] # NEED oidc_options[:issuer] = ENV['OIDC_ISSUER'] if ENV['OIDC_ISSUER'] # NEED

4
config/omniauth.yml Normal file
View File

@ -0,0 +1,4 @@
shared:
cas_enabled?: <%= ENV.fetch('CAS_ENABLED', 'false') == 'true' %>
oidc_enabled?: <%= ENV.fetch('OIDC_ENABLED', 'false') == 'true' %>
saml_enabled?: <%= ENV.fetch('SAML_ENABLED', 'false') == 'true' %>

6
spec/requests/omniauth_callbacks_spec.rb
View File

@ -129,15 +129,15 @@ RSpec.describe 'OmniAuth callbacks' do
end end
end end
describe '#openid_connect', if: ENV['OIDC_ENABLED'] == 'true' && ENV['OIDC_SCOPE'].present? do describe '#openid_connect', if: Rails.configuration.x.omniauth.oidc_enabled? && ENV['OIDC_SCOPE'].present? do
it_behaves_like 'omniauth provider callbacks', :openid_connect it_behaves_like 'omniauth provider callbacks', :openid_connect
end end
describe '#cas', if: ENV['CAS_ENABLED'] == 'true' do describe '#cas', if: Rails.configuration.x.omniauth.cas_enabled? do
it_behaves_like 'omniauth provider callbacks', :cas it_behaves_like 'omniauth provider callbacks', :cas
end end
describe '#saml', if: ENV['SAML_ENABLED'] == 'true' do describe '#saml', if: Rails.configuration.x.omniauth.saml_enabled? do
it_behaves_like 'omniauth provider callbacks', :saml it_behaves_like 'omniauth provider callbacks', :saml
end end
end end