techhub/mastodon
2
0
Fork 0
Code Activity

Finish email allow/deny list naming migration (#30530)

Browse Source
This commit is contained in:
Matt Jankowski
2024-08-13 03:37:32 -04:00
committed by GitHub
parent f6d090fdf5
commit 02df1b4e4a
11 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/blacklists.rb
View File

@@ -1,6 +0,0 @@
# frozen_string_literal: true
Rails.application.configure do
config.x.email_domains_blacklist = (ENV['EMAIL_DOMAIN_DENYLIST'] || ENV['EMAIL_DOMAIN_BLACKLIST']) || ''
config.x.email_domains_whitelist = (ENV['EMAIL_DOMAIN_ALLOWLIST'] || ENV['EMAIL_DOMAIN_WHITELIST']) || ''
end

2
config/initializers/doorkeeper.rb
View File

@@ -147,7 +147,7 @@ Doorkeeper.configure do
force_ssl_in_redirect_uri false
# Specify what redirect URI's you want to block during Application creation.
# Any redirect URI is whitelisted by default.
# Any redirect URI is allowed by default.
#
# You can use this option in order to forbid URI's with 'javascript' scheme
# for example.

6
config/initializers/email_domains_lists.rb Normal file
View File

@@ -0,0 +1,6 @@
# frozen_string_literal: true
Rails.application.configure do
config.x.email_domains_denylist = ENV.fetch('EMAIL_DOMAIN_DENYLIST', nil) || ENV.fetch('EMAIL_DOMAIN_BLACKLIST', '')
config.x.email_domains_allowlist = ENV.fetch('EMAIL_DOMAIN_ALLOWLIST', nil) || ENV.fetch('EMAIL_DOMAIN_WHITELIST', '')
end