Fix encoding error when checking e-mail MX records (#11696)

mastodon · Aug 29, 2019 · bfca58d · bfca58d
1 parent 1499649
commit bfca58d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
@@ -14,6 +14,7 @@ def invalid_mx?(value)
 
     return true if domain.nil?
 
+    domain    = TagManager.instance.normalize_domain(domain)
     hostnames = []
     ips       = []
 
@@ -29,6 +30,8 @@ def invalid_mx?(value)
     end
 
     ips.empty? || on_blacklist?(hostnames + ips)
+  rescue Addressable::URI::InvalidURIError
+    true
   end
 
   def on_blacklist?(values)