jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

emails: fix validation of undeliverable email addresses.

Browse Source 
* Fix bug where bogus domains weren't found because we checked for `nil?` instead of `blank?`.
* Fix bug where bogus names weren't found because we used a nonexistent variable in the
  RCPT TO check (`to_address` instead of `address`).
This commit is contained in:
evazion
2022-10-30 14:44:55 -05:00
parent d65a35d4ae
commit eff82c43d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/danbooru/email_address.rb
View File

@@ -334,7 +334,7 @@ module Danbooru
# still fail if the mailbox doesn't exist and the server lied to the RCPT TO command. # still fail if the mailbox doesn't exist and the server lied to the RCPT TO command.
def undeliverable?(from_address: Danbooru.config.contact_email, timeout: 3, allow_smtp: false) def undeliverable?(from_address: Danbooru.config.contact_email, timeout: 3, allow_smtp: false)
mail_server = mx_domain(timeout: timeout) mail_server = mx_domain(timeout: timeout)
return true if mail_server.nil? return true if mail_server.blank?
return false if !allow_smtp return false if !allow_smtp
smtp = Net::SMTP.new(mail_server) smtp = Net::SMTP.new(mail_server)
@@ -346,7 +346,7 @@ module Danbooru
conn.mailfrom(from_address) conn.mailfrom(from_address)
# Net::SMTPFatalError is raised if RCPT TO returns a 5xx error. # Net::SMTPFatalError is raised if RCPT TO returns a 5xx error.
response = conn.rcptto(to_address) rescue $! response = conn.rcptto(address) rescue $!
return response.is_a?(Net::SMTPFatalError) return response.is_a?(Net::SMTPFatalError)
end end
rescue rescue