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

2023-01-24 20:32:31 +01:00
parent 368d6fe54f a5a00d7f7a
commit 3074338d79
108 changed files with 1004 additions and 571 deletions
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -10,6 +10,8 @@ class EmailMxValidator < ActiveModel::Validator

    if domain.blank?
      user.errors.add(:email, :invalid)
+    elsif domain.include?('..')
+      user.errors.add(:email, :invalid)
    elsif !on_allowlist?(domain)
      resolved_ips, resolved_domains = resolve_mx(domain)