Merge branch 'main' into glitch-soc/merge-upstream

2021-03-24 10:53:50 +01:00
parent d7c1c41859 88d69d3261
commit f60c99a8fb
53 changed files with 684 additions and 404 deletions
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@ -10,7 +10,7 @@ class EmailMxValidator < ActiveModel::Validator

    if domain.blank?
      user.errors.add(:email, :invalid)
-    else
+    elsif !on_allowlist?(domain)
      ips, hostnames = resolve_mx(domain)

      if ips.empty?
@ -33,6 +33,12 @@ class EmailMxValidator < ActiveModel::Validator
    nil
  end

+  def on_allowlist?(domain)
+    return false if Rails.configuration.x.email_domains_whitelist.blank?
+
+    Rails.configuration.x.email_domains_whitelist.include?(domain)
+  end
+
  def resolve_mx(domain)
    hostnames = []
    ips       = []