From 63c7b9157274f57c496399a1a5c728b32415034c Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 27 May 2018 04:58:08 +0200 Subject: Validate that e-mail resolves with MX and it's not blacklisted (#7631) Original patch by @j-a4 --- app/validators/email_mx_validator.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 app/validators/email_mx_validator.rb (limited to 'app/validators') diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb new file mode 100644 index 000000000..d4c7cc252 --- /dev/null +++ b/app/validators/email_mx_validator.rb @@ -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 -- cgit From 03f4c214b459a241a1aab08095a986475bd6f8f0 Mon Sep 17 00:00:00 2001 From: takayamaki Date: Tue, 29 May 2018 02:14:24 +0900 Subject: fix: Don't validate MX record in development (#7654) --- app/validators/email_mx_validator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/validators') diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb index d4c7cc252..3cc5853c6 100644 --- a/app/validators/email_mx_validator.rb +++ b/app/validators/email_mx_validator.rb @@ -4,7 +4,7 @@ require 'resolv' class EmailMxValidator < ActiveModel::Validator def validate(user) - return if Rails.env.test? + return if Rails.env.test? || Rails.env.development? user.errors.add(:email, I18n.t('users.invalid_email')) if invalid_mx?(user.email) end -- cgit