tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve e-mail MX validator and add tests (#9489)

Browse Source
This commit is contained in:
Eugen Rochko
2018-12-10 22:53:25 +01:00
committed by GitHub
parent 3f12c07ff5
commit dbb1ee269f
3 changed files with 94 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.rb
View File

@ -73,7 +73,7 @@ class User < ApplicationRecord
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
validates_with BlacklistedEmailValidator, if: :email_changed?
validates_with EmailMxValidator, if: :email_changed?
validates_with EmailMxValidator, if: :validate_email_dns?
scope :recent, -> { order(id: :desc) }
scope :admins, -> { where(admin: true) }
@ -360,4 +360,8 @@ class User < ApplicationRecord
def needs_feed_update?
last_sign_in_at < ACTIVE_DURATION.ago
end
def validate_email_dns?
email_changed? && !(Rails.env.test? || Rails.env.development?)
end
end