stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make use of email_domain in sign up approval check (#38199)

Browse Source
This commit is contained in:
Matt Jankowski
2026-03-16 04:34:18 -04:00
committed by GitHub
parent 5b6b86c97c
commit f561014aa8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user.rb
View File

@@ -463,18 +463,15 @@ class User < ApplicationRecord
end end
def sign_up_email_requires_approval? def sign_up_email_requires_approval?
return false if email.blank? return false if email_domain.blank?
_, domain = email.split('@', 2)
return false if domain.blank?
records = [] records = []
# Doing this conditionally is not very satisfying, but this is consistent # Doing this conditionally is not very satisfying, but this is consistent
# with the MX records validations we do and keeps the specs tractable. # with the MX records validations we do and keeps the specs tractable.
records = DomainResource.new(domain).mx unless self.class.skip_mx_check? records = DomainResource.new(email_domain).mx unless self.class.skip_mx_check?
EmailDomainBlock.requires_approval?(records + [domain], attempt_ip: sign_up_ip) EmailDomainBlock.requires_approval?(records + [email_domain], attempt_ip: sign_up_ip)
end end
def sign_up_username_requires_approval? def sign_up_username_requires_approval?