Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

FIX: allow developer emails to bypass email blacklist/whitelist restriction

Browse source
This commit is contained in:
Arpit Jalan 2015-01-29 23:22:59 +05:30
parent 4fd0200df8
commit 58f46137d6
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/validators/email_validator.rb
View file

@ -2,11 +2,11 @@ class EmailValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
if (setting = SiteSetting.email_domains_whitelist).present?
unless email_in_restriction_setting?(setting, value)
unless email_in_restriction_setting?(setting, value) || is_developer?(value)
record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
end
elsif (setting = SiteSetting.email_domains_blacklist).present?
if email_in_restriction_setting?(setting, value)
if email_in_restriction_setting?(setting, value) && !is_developer?(value)
record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
end
end
@ -21,6 +21,10 @@ class EmailValidator < ActiveModel::EachValidator
value =~ regexp
end
def is_developer?(value)
Rails.configuration.respond_to?(:developer_emails) && Rails.configuration.developer_emails.include?(value)
end
def self.email_regex
/^[a-zA-Z0-9!#\$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#\$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/
end