diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
commit | 9044a2b051da18e9f70fd4fae55c2bd232891d1f (patch) | |
tree | 0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4 /app/validators/email_mx_validator.rb | |
parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
parent | 49f57b55346f8e62d21a3c8bc63301038ecb796f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
Diffstat (limited to 'app/validators/email_mx_validator.rb')
-rw-r--r-- | app/validators/email_mx_validator.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb index 96fbedcfc..9b5009966 100644 --- a/app/validators/email_mx_validator.rb +++ b/app/validators/email_mx_validator.rb @@ -14,6 +14,7 @@ class EmailMxValidator < ActiveModel::Validator return true if domain.nil? + domain = TagManager.instance.normalize_domain(domain) hostnames = [] ips = [] @@ -29,6 +30,8 @@ class EmailMxValidator < ActiveModel::Validator end ips.empty? || on_blacklist?(hostnames + ips) + rescue Addressable::URI::InvalidURIError + true end def on_blacklist?(values) |