about summary refs log tree commit diff
path: root/app/lib/email_validator.rb
diff options
context:
space:
mode:
authorPete Keen <pete@petekeen.net>2017-04-04 11:04:44 -0400
committerPete Keen <pete@petekeen.net>2017-04-04 11:20:15 -0400
commite9a6da6bc739f4f68447f56b93810762da388ce8 (patch)
tree5e18d2c5197f7e14d372d1353467bcba69f196c8 /app/lib/email_validator.rb
parent5f54981846508daf9558f66ffd70d42d8213bea9 (diff)
[#817] Add email whitelist
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes #817
Diffstat (limited to 'app/lib/email_validator.rb')
-rw-r--r--app/lib/email_validator.rb17
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