Correct validators so that existing error messages would look correct (#3668)

1 files changed, 31 insertions, 0 deletions

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