Validate that e-mail resolves with MX and it's not blacklisted (#7631)
Original patch by @j-a4
This commit is contained in:
		
							parent
							
								
									182bdbc5f4
								
							
						
					
					
						commit
						63c7b91572
					
				| @ -65,6 +65,7 @@ class User < ApplicationRecord | |||||||
| 
 | 
 | ||||||
|   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? |   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? | ||||||
|   validates_with BlacklistedEmailValidator, if: :email_changed? |   validates_with BlacklistedEmailValidator, if: :email_changed? | ||||||
|  |   validates_with EmailMxValidator, if: :email_changed? | ||||||
| 
 | 
 | ||||||
|   scope :recent, -> { order(id: :desc) } |   scope :recent, -> { order(id: :desc) } | ||||||
|   scope :admins, -> { where(admin: true) } |   scope :admins, -> { where(admin: true) } | ||||||
|  | |||||||
							
								
								
									
										25
									
								
								app/validators/email_mx_validator.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								app/validators/email_mx_validator.rb
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,25 @@ | |||||||
|  | # frozen_string_literal: true | ||||||
|  | 
 | ||||||
|  | require 'resolv' | ||||||
|  | 
 | ||||||
|  | class EmailMxValidator < ActiveModel::Validator | ||||||
|  |   def validate(user) | ||||||
|  |     return if Rails.env.test? | ||||||
|  |     user.errors.add(:email, I18n.t('users.invalid_email')) if invalid_mx?(user.email) | ||||||
|  |   end | ||||||
|  | 
 | ||||||
|  |   private | ||||||
|  | 
 | ||||||
|  |   def invalid_mx?(value) | ||||||
|  |     _, domain = value.split('@', 2) | ||||||
|  | 
 | ||||||
|  |     return true if domain.nil? | ||||||
|  | 
 | ||||||
|  |     records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s } | ||||||
|  |     records.empty? || on_blacklist?(records) | ||||||
|  |   end | ||||||
|  | 
 | ||||||
|  |   def on_blacklist?(values) | ||||||
|  |     EmailDomainBlock.where(domain: values).any? | ||||||
|  |   end | ||||||
|  | end | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user