erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Move omniauth feature enabled checks to config_for yml

Browse source
This commit is contained in:
Matt Jankowski 2024-06-11 10:45:08 -04:00
parent b42661ba95
commit d886b20019
11 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

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

2
app/controllers/concerns/web_app_controller_concern.rb
View file

@ -11,7 +11,7 @@ module WebAppControllerConcern
end
def skip_csrf_meta_tags?
!(ENV['ONE_CLICK_SSO_LOGIN'] == 'true' && ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1) && current_user.nil?
!(ENV['ONE_CLICK_SSO_LOGIN'] == 'true' && Rails.configuration.x.omniauth.only && Devise.omniauth_providers.length == 1) && current_user.nil?
end
def set_app_body_class

2
app/helpers/application_helper.rb
View file

@ -49,7 +49,7 @@ module ApplicationHelper
end
def omniauth_only?
ENV['OMNIAUTH_ONLY'] == 'true'
Rails.configuration.x.omniauth.only
end
def link_to_login(name = nil, html_options = nil, &block)

2
app/helpers/registration_helper.rb
View file

@ -12,7 +12,7 @@ module RegistrationHelper
end
def omniauth_only?
ENV['OMNIAUTH_ONLY'] == 'true'
Rails.configuration.x.omniauth.only
end
def ip_blocked?(remote_ip)

2
app/serializers/initial_state_serializer.rb
View file

@ -125,6 +125,6 @@ class InitialStateSerializer < ActiveModel::Serializer
end
def sso_redirect
"/auth/auth/#{Devise.omniauth_providers[0]}" if ENV['ONE_CLICK_SSO_LOGIN'] == 'true' && ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1
"/auth/auth/#{Devise.omniauth_providers[0]}" if ENV['ONE_CLICK_SSO_LOGIN'] == 'true' && Rails.configuration.x.omniauth.only && Devise.omniauth_providers.length == 1
end
end

3
config/application.rb
View file

@ -112,6 +112,9 @@ module Mastodon
end
end
# Load config/omniauth.yml settings
config.x.omniauth = config_for(:omniauth)
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'modal'
Doorkeeper::AuthorizedApplicationsController.layout 'admin'

6
config/initializers/3_omniauth.rb
View file

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

2
config/initializers/content_security_policy.rb
View file

@ -14,7 +14,7 @@ media_hosts = policy.media_hosts
def sso_host
return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true'
return unless ENV['OMNIAUTH_ONLY'] == 'true'
return unless Rails.configuration.omniauth.only
return unless Devise.omniauth_providers.length == 1
provider = Devise.omniauth_configs[Devise.omniauth_providers[0]]

6
config/omniauth.yml Normal file
View file

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

19
spec/helpers/application_helper_spec.rb
View file

@ -88,9 +88,10 @@ describe ApplicationHelper do
context 'when in omniauth only mode' do
around do |example|
ClimateControl.modify OMNIAUTH_ONLY: 'true' do
original = Rails.configuration.x.omniauth.only
Rails.configuration.x.omniauth.only = true
example.run
end
Rails.configuration.x.omniauth.only = original
end
it 'redirects to joinmastodon site' do
@ -106,11 +107,12 @@ describe ApplicationHelper do
end
describe 'omniauth_only?' do
context 'when env var is set to true' do
context 'when configuration is set to true' do
around do |example|
ClimateControl.modify OMNIAUTH_ONLY: 'true' do
original = Rails.configuration.x.omniauth.only
Rails.configuration.x.omniauth.only = true
example.run
end
Rails.configuration.x.omniauth.only = original
end
it 'returns true' do
@ -118,11 +120,12 @@ describe ApplicationHelper do
end
end
context 'when env var is not set' do
context 'when configuration is false' do
around do |example|
ClimateControl.modify OMNIAUTH_ONLY: nil do
original = Rails.configuration.x.omniauth.only
Rails.configuration.x.omniauth.only = false
example.run
end
Rails.configuration.x.omniauth.only = original
end
it 'returns false' do

6
spec/requests/omniauth_callbacks_spec.rb
View file

@ -129,15 +129,15 @@ describe 'OmniAuth callbacks' do
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
include_examples 'omniauth provider callbacks', :openid_connect
end
describe '#cas', if: ENV['CAS_ENABLED'] == 'true' do
describe '#cas', if: Rails.configuration.x.omniauth.cas_enabled do
include_examples 'omniauth provider callbacks', :cas
end
describe '#saml', if: ENV['SAML_ENABLED'] == 'true' do
describe '#saml', if: Rails.configuration.x.omniauth.saml_enabled do
include_examples 'omniauth provider callbacks', :saml
end
end