mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 17:53:23 +08:00
9acdafe87c
The EmailValidator.email_regex method was moved to EmailAddressValidator.email_regex and marked for removal in 2.9.0. The method was proxied for backwards compatibility in plugins. This PR removes the method.
56 lines
1.7 KiB
Ruby
56 lines
1.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class EmailValidator < ActiveModel::EachValidator
|
|
def validate_each(record, attribute, value)
|
|
if value.blank?
|
|
record.errors.add(attribute, I18n.t(:"user.email.blank"))
|
|
invalid = true
|
|
elsif !EmailAddressValidator.valid_value?(value)
|
|
if Invite === record && attribute == :email
|
|
record.errors.add(:base, I18n.t(:"invite.invalid_email", email: CGI.escapeHTML(value)))
|
|
else
|
|
record.errors.add(attribute, I18n.t(:"user.email.invalid"))
|
|
end
|
|
invalid = true
|
|
end
|
|
|
|
if !EmailValidator.allowed?(value)
|
|
record.errors.add(attribute, I18n.t(:"user.email.not_allowed"))
|
|
invalid = true
|
|
end
|
|
|
|
if !invalid && ScreenedEmail.should_block?(value)
|
|
record.errors.add(attribute, I18n.t(:"user.email.blocked"))
|
|
end
|
|
end
|
|
|
|
def self.allowed?(email)
|
|
if (setting = SiteSetting.allowed_email_domains).present?
|
|
return email_in_restriction_setting?(setting, email) || is_developer?(email)
|
|
elsif (setting = SiteSetting.blocked_email_domains).present?
|
|
return !(email_in_restriction_setting?(setting, email) && !is_developer?(email))
|
|
end
|
|
|
|
true
|
|
end
|
|
|
|
def self.can_auto_approve_user?(email)
|
|
if (setting = SiteSetting.auto_approve_email_domains).present?
|
|
return !!(EmailValidator.allowed?(email) && email_in_restriction_setting?(setting, email))
|
|
end
|
|
|
|
false
|
|
end
|
|
|
|
def self.email_in_restriction_setting?(setting, value)
|
|
domains = setting.gsub(".", '\.')
|
|
regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
|
|
value =~ regexp
|
|
end
|
|
|
|
def self.is_developer?(value)
|
|
Rails.configuration.respond_to?(:developer_emails) &&
|
|
Rails.configuration.developer_emails.include?(value)
|
|
end
|
|
end
|