Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Bypass MX validation for explicitly allowed domains (#15930)

Browse source 
* Bypass MX validation for explicitly allowed domains

This spares some lookups and prevent issues in some edge cases with
local domains.

* Add tests

* Fix test
This commit is contained in:
Claire 2021-03-19 23:48:47 +01:00 • committed by GitHub
parent d023eefbcc
commit 051efed5ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/validators/email_mx_validator.rb
View file

@ -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 = []