techhub/mastodon
2
0
Fork 0
Code Activity

Add DomainResource class to wrap MX lookup/normalize (#32864)

Browse Source
This commit is contained in:
Matt Jankowski
2024-11-14 08:47:29 -05:00
committed by GitHub
parent e8b6607ece
commit 62d65504f6
6 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@@ -457,13 +457,7 @@ class User < ApplicationRecord
# Doing this conditionally is not very satisfying, but this is consistent
# with the MX records validations we do and keeps the specs tractable.
unless self.class.skip_mx_check?
Resolv::DNS.open do |dns|
dns.timeouts = 5
records = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }.compact_blank
end
end
records = DomainResource.new(domain).mx unless self.class.skip_mx_check?
EmailDomainBlock.requires_approval?(records + [domain], attempt_ip: sign_up_ip)
end