zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 21:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2247 from internetee/2244-email-validaiton-on-mx-record-level-in-incomplete

Browse source 
update mx condition for invalid emails
This commit is contained in:
Timo Võhmar 2021-12-28 04:09:22 +02:00 • committed by GitHub
commit 080c3793cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 223 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/interactions/actions/email_check.rb
View file

@ -50,12 +50,49 @@ module Actions
end
def save_result(result)
validation_eventable.validation_events.create(validation_event_attrs(result))
if !result.success && @check_level == "mx"
email_domain = Mail::Address.new(@email).domain
result_validation = check_for_records_value(domain: email_domain, value: 'A')
logger.info "Validated A record for #{email_domain}. Validation result - #{result_validation}"
p "Validated A record for #{email_domain}. Validation result - #{result_validation}"
result_validation = check_for_records_value(domain: email_domain, value: 'AAAA') if result_validation.empty?
logger.info "Validated AAAA record for #{email_domain}. Validation result - #{result_validation}" if result_validation.empty?
p "Validated AAAA record for #{email_domain}. Validation result - #{result_validation}" if result_validation.empty?
result_validation.present? ? result.success = true : result.success = false
validation_eventable.validation_events.create(validation_event_attrs(result))
else
validation_eventable.validation_events.create(validation_event_attrs(result))
end
rescue ActiveRecord::RecordNotSaved
logger.info "Cannot save validation result for #{log_object_id}"
true
end
def check_for_records_value(domain:, value:)
result = nil
dns_servers = ENV['dnssec_resolver_ips'].to_s.split(',').map(&:strip)
Resolv::DNS.open({ nameserver: dns_servers }) do |dns|
dns.timeouts = ENV['a_and_aaaa_validation_timeout'].to_i || 1
ress = nil
case value
when 'A'
ress = dns.getresources domain, Resolv::DNS::Resource::IN::A
when 'AAAA'
ress = dns.getresources domain, Resolv::DNS::Resource::IN::AAAA
end
result = ress.map { |r| r.address }
end
result
end
def validation_event_attrs(result)
{
event_data: event_data(result),

2
app/interactions/domains/force_delete_email/base.rb
View file

@ -12,6 +12,8 @@ module Domains
Domain.where(registrant_id: registrant_ids)
domains.each do |domain|
next if domain.expired?
before_execute_force_delete(domain)
end
end

10
config/application.yml.sample
View file

@ -224,3 +224,13 @@ airbrake_host: "https://your-errbit-host.ee"
# airbrake_env: "staging"
airbrake_project_id: "1"
airbrake_project_key: "api_key"
registry_api_url: 'http://registry:3000/api/v1/contact_requests/'
registry_api_key: 'testkey'
registry_demo_registrar_port: '3000'
registry_demo_registrar_results_url: 'http://registry.test/api/v1/accreditation_center/results'
registry_demo_registrar_api_user_url: 'http://registry.test/api/v1/accreditation_center/show_api_user'
registry_demo_accredited_users_url: 'http://registry.test/api/v1/accreditation_center/list_accreditated_api_users'
a_and_aaaa_validation_timeout: '1'

4
config/initializers/truemail.rb
View file

@ -15,10 +15,10 @@ Truemail.configure do |config|
# config.smtp_error_body_pattern = /regex_pattern/
# Optional parameter. Connection timeout is equal to 2 ms by default.
config.connection_timeout = ENV['default_connection_timeout'].to_i
config.connection_timeout = ENV['default_connection_timeout'].to_i | 1
# Optional parameter. A SMTP server response timeout is equal to 2 ms by default.
config.response_timeout = ENV['default_response_timeout'].to_i
config.response_timeout = ENV['default_response_timeout'].to_i | 1
# Optional parameter. Total of connection attempts. It is equal to 2 by default.
# This parameter uses in mx lookup timeout error and smtp request (for cases when

88
test/integration/epp/domain/update/base_test.rb
View file

@ -717,49 +717,51 @@ class EppDomainUpdateBaseTest < EppTestCase
assert_no_emails
end
def test_makes_update_if_was_forcedelete
contact = @domain.contacts.first
contact.update_attribute(:email, '`@outlook.test')
contact.verify_email
assert contact.email_verification_failed?
@domain.reload
assert @domain.force_delete_scheduled?
@domain.update_attribute(:statuses_before_force_delete, nil)
Setting.request_confirmation_on_registrant_change_enabled = true
new_registrant = contacts(:william).becomes(Registrant)
assert_not_equal new_registrant, @domain.registrant
request_xml = <<-XML
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee', for_version: '1.0')}">
<command>
<update>
<domain:update xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee', for_version: '1.2')}">
<domain:name>#{@domain.name}</domain:name>
<domain:chg>
<domain:registrant verified="yes">#{new_registrant.code}</domain:registrant>
</domain:chg>
</domain:update>
</update>
<extension>
<eis:extdata xmlns:eis="#{Xsd::Schema.filename(for_prefix: 'eis', for_version: '1.0')}">
<eis:legalDocument type="pdf">#{'test' * 2000}</eis:legalDocument>
</eis:extdata>
</extension>
</command>
</epp>
XML
post epp_update_path, params: { frame: request_xml },
headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
@domain.reload
response_xml = Nokogiri::XML(response.body)
assert_correct_against_schema response_xml
assert_epp_response :completed_successfully
end
# COMMENT OU REASON: FOR EXPIRED DOMAIN SHOULD NOT SET FD
# def test_makes_update_if_was_forcedelete
# contact = @domain.contacts.first
# contact.update_attribute(:email, '`@outlook.test')
# contact.verify_email
# assert contact.email_verification_failed?
# @domain.reload
#
# assert @domain.force_delete_scheduled?
#
# @domain.update_attribute(:statuses_before_force_delete, nil)
#
# Setting.request_confirmation_on_registrant_change_enabled = true
# new_registrant = contacts(:william).becomes(Registrant)
# assert_not_equal new_registrant, @domain.registrant
#
# request_xml = <<-XML
# <?xml version="1.0" encoding="UTF-8" standalone="no"?>
# <epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee', for_version: '1.0')}">
# <command>
# <update>
# <domain:update xmlns:domain="#{Xsd::Schema.filename(for_prefix: 'domain-ee', for_version: '1.2')}">
# <domain:name>#{@domain.name}</domain:name>
# <domain:chg>
# <domain:registrant verified="yes">#{new_registrant.code}</domain:registrant>
# </domain:chg>
# </domain:update>
# </update>
# <extension>
# <eis:extdata xmlns:eis="#{Xsd::Schema.filename(for_prefix: 'eis', for_version: '1.0')}">
# <eis:legalDocument type="pdf">#{'test' * 2000}</eis:legalDocument>
# </eis:extdata>
# </extension>
# </command>
# </epp>
# XML
#
# post epp_update_path, params: { frame: request_xml },
# headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
# @domain.reload
#
# response_xml = Nokogiri::XML(response.body)
# assert_correct_against_schema response_xml
# assert_epp_response :completed_successfully
# end
def test_clears_force_delete_when_registrar_changed
Setting.request_confirmation_on_registrant_change_enabled = true

98
test/interactions/email_check_test.rb Normal file
View file

@ -0,0 +1,98 @@
require 'test_helper'
class DoRequestTest < ActiveSupport::TestCase
setup do
WebMock.disable_net_connect!
@contact = contacts(:john)
end
def test_invalid_email_in_mx_level_with_a_and_aaaa_records
trumail_results = OpenStruct.new(success: false,
email: @contact.email,
domain: "box.tests",
errors: {:mx=>"target host(s) not found"},
)
Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
Spy.on_instance_method(Actions::EmailCheck, :check_for_records_value).and_return([true])
action = Actions::EmailCheck.new(email: @contact.email,
validation_eventable: @contact,
check_level: 'mx')
action.call
assert_equal @contact.validation_events.count, 1
assert @contact.validation_events.last.success
end
def test_invalid_email_in_mx_level_with_empty_a_and_aaaa_records
trumail_results = OpenStruct.new(success: false,
email: @contact.email,
domain: "box.tests",
errors: {:mx=>"target host(s) not found"},
)
Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
Spy.on_instance_method(Actions::EmailCheck, :check_for_records_value).and_return([])
action = Actions::EmailCheck.new(email: @contact.email,
validation_eventable: @contact,
check_level: 'mx')
action.call
assert_equal @contact.validation_events.count, 1
refute @contact.validation_events.last.success
end
def test_should_remove_invalid_validation_record_if_there_count_more_than_three
trumail_results = OpenStruct.new(success: false,
email: @contact.email,
domain: "box.tests",
errors: {:mx=>"target host(s) not found"},
)
Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
Spy.on_instance_method(Actions::EmailCheck, :check_for_records_value).and_return([])
action = Actions::EmailCheck.new(email: @contact.email,
validation_eventable: @contact,
check_level: 'mx')
3.times do
action.call
end
assert_equal @contact.validation_events.count, 3
refute @contact.validation_events.last.success
3.times do
action.call
end
assert_equal @contact.validation_events.count, 3
refute @contact.validation_events.last.success
end
def test_should_remove_valid_validation_record_if_there_count_more_than_one
trumail_results = OpenStruct.new(success: false,
email: @contact.email,
domain: "box.tests",
errors: {:mx=>"target host(s) not found"},
)
Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
Spy.on_instance_method(Actions::EmailCheck, :check_for_records_value).and_return([true])
action = Actions::EmailCheck.new(email: @contact.email,
validation_eventable: @contact,
check_level: 'mx')
3.times do
action.call
end
assert_equal @contact.validation_events.count, 1
assert @contact.validation_events.last.success
end
end

55
test/mailers/domain_expire_mailer_test.rb
View file

@ -29,31 +29,32 @@ class DomainExpireMailerTest < ActionMailer::TestCase
email.subject
end
def test_delivers_domain_expiration_soft_email_if_auto_fd
domain = domains(:shop)
email_address = domain.registrar.email
assert_not domain.force_delete_scheduled?
travel_to Time.zone.parse('2010-07-05')
email = '`@internet.ee'
Truemail.configure.default_validation_type = :regex
contact = domain.admin_contacts.first
contact.update_attribute(:email, email)
contact.verify_email
assert contact.email_verification_failed?
domain.reload
assert domain.force_delete_scheduled?
email = DomainExpireMailer.expired_soft(domain: domain,
registrar: domain.registrar,
email: email_address).deliver_now
assert_emails 1
assert_equal I18n.t("domain_expire_mailer.expired_soft.subject", domain_name: domain.name),
email.subject
end
# COMMENT OU REASON: FOR EXPIRED DOMAIN SHOULD NOT SET FD
# def test_delivers_domain_expiration_soft_email_if_auto_fd
# domain = domains(:shop)
# email_address = domain.registrar.email
# assert_not domain.force_delete_scheduled?
# travel_to Time.zone.parse('2010-07-05')
# email = '`@internet.ee'
#
# Truemail.configure.default_validation_type = :regex
#
# contact = domain.admin_contacts.first
# contact.update_attribute(:email, email)
# contact.verify_email
#
# assert contact.email_verification_failed?
#
# domain.reload
#
# assert_no domain.force_delete_scheduled?
#
# email = DomainExpireMailer.expired_soft(domain: domain,
# registrar: domain.registrar,
# email: email_address).deliver_now
#
# assert_emails 1
# assert_equal I18n.t("domain_expire_mailer.expired_soft.subject", domain_name: domain.name),
# email.subject
# end
end

19
test/tasks/emails/verify_email_task_test.rb
View file

@ -100,25 +100,6 @@ class VerifyEmailTaskTest < ActiveJob::TestCase
# assert_equal ValidationEvent.all.count, 9
# end
def test_should_set_fd_for_failed_email_after_several_times
contact = contacts(:john)
trumail_results = OpenStruct.new(success: false,
email: contact.email,
domain: "inbox.tests",
errors: {:mx=>"target host(s) not found"},
)
Spy.on_instance_method(Actions::EmailCheck, :check_email).and_return(trumail_results)
assert_not contact.domains.last.force_delete_scheduled?
3.times do
run_task
end
assert contact.domains.last.force_delete_scheduled?
end
def test_fd_should_not_removed_if_change_email_to_another_invalid_one
contact = contacts(:john)