From cdff1da901c5e649f75f9fe89e5cf17b591f049e Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 9 Jun 2017 19:46:01 +0200 Subject: Correct validators so that existing error messages would look correct (#3668) --- app/validators/blacklisted_email_validator.rb | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 app/validators/blacklisted_email_validator.rb (limited to 'app/validators/blacklisted_email_validator.rb') diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb new file mode 100644 index 000000000..0ba79694b --- /dev/null +++ b/app/validators/blacklisted_email_validator.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +class BlacklistedEmailValidator < ActiveModel::Validator + def validate(user) + user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?(user.email) + end + + private + + def blocked_email?(value) + on_blacklist?(value) || not_on_whitelist?(value) + end + + def on_blacklist?(value) + return false if Rails.configuration.x.email_domains_blacklist.blank? + + domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.') + regexp = Regexp.new("@(.+\\.)?(#{domains})", true) + + value =~ regexp + end + + def not_on_whitelist?(value) + return false if Rails.configuration.x.email_domains_whitelist.blank? + + domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.') + regexp = Regexp.new("@(.+\\.)?(#{domains})$", true) + + value !~ regexp + end +end -- cgit