diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-05 03:19:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 03:19:14 +0200 |
commit | 78c1e2e9582f582b627e0144076bb76a886a41c2 (patch) | |
tree | 259de6b676b6ca29687faa770089e3957049ea65 /app/lib/email_validator.rb | |
parent | 7015578655553b89e0184e6fe10b88075f4d8446 (diff) | |
parent | ab98591af83ef7a617a877cc8519b203e0481e8a (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/lib/email_validator.rb')
-rw-r--r-- | app/lib/email_validator.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/lib/email_validator.rb b/app/lib/email_validator.rb index 856b8b1f7..06e9375f6 100644 --- a/app/lib/email_validator.rb +++ b/app/lib/email_validator.rb @@ -2,17 +2,30 @@ class EmailValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) - return if Rails.configuration.x.email_domains_blacklist.empty? - record.errors.add(attribute, I18n.t('users.invalid_email')) if blocked_email?(value) 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 |