7cb369d4c6
* Change e-mail whitelist/blacklist to not be checked when invited And only when creating an account, not when updating it later Fix #10648 * Fix test
37 lines
895 B
Ruby
37 lines
895 B
Ruby
# frozen_string_literal: true
|
|
|
|
class BlacklistedEmailValidator < ActiveModel::Validator
|
|
def validate(user)
|
|
return if user.invited?
|
|
|
|
@email = user.email
|
|
|
|
user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?
|
|
end
|
|
|
|
private
|
|
|
|
def blocked_email?
|
|
on_blacklist? || not_on_whitelist?
|
|
end
|
|
|
|
def on_blacklist?
|
|
return true if EmailDomainBlock.block?(@email)
|
|
return false if Rails.configuration.x.email_domains_blacklist.blank?
|
|
|
|
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
|
|
regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
|
|
|
|
@email =~ regexp
|
|
end
|
|
|
|
def not_on_whitelist?
|
|
return false if Rails.configuration.x.email_domains_whitelist.blank?
|
|
|
|
domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
|
|
regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
|
|
|
|
@email !~ regexp
|
|
end
|
|
end
|