mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-25 12:34:58 +01:00
Add common stub setup for resolv dns in email mx validator spec (#29140)
This commit is contained in:
parent
67ec192d7d
commit
a9e91eb955
@ -5,6 +5,7 @@ require 'rails_helper'
|
|||||||
describe EmailMxValidator do
|
describe EmailMxValidator do
|
||||||
describe '#validate' do
|
describe '#validate' do
|
||||||
let(:user) { instance_double(User, email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil)) }
|
let(:user) { instance_double(User, email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil)) }
|
||||||
|
let(:resolv_dns_double) { instance_double(Resolv::DNS) }
|
||||||
|
|
||||||
context 'with an e-mail domain that is explicitly allowed' do
|
context 'with an e-mail domain that is explicitly allowed' do
|
||||||
around do |block|
|
around do |block|
|
||||||
@ -15,13 +16,7 @@ describe EmailMxValidator do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'does not add errors if there are no DNS records' do
|
it 'does not add errors if there are no DNS records' do
|
||||||
resolver = instance_double(Resolv::DNS)
|
configure_resolver('example.com')
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
|
|
||||||
subject.validate(user)
|
subject.validate(user)
|
||||||
expect(user.errors).to_not have_received(:add)
|
expect(user.errors).to_not have_received(:add)
|
||||||
@ -29,13 +24,7 @@ describe EmailMxValidator do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'adds no error if there are DNS records for the e-mail domain' do
|
it 'adds no error if there are DNS records for the e-mail domain' do
|
||||||
resolver = instance_double(Resolv::DNS)
|
configure_resolver('example.com', a: resolv_double_a('192.0.2.42'))
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([Resolv::DNS::Resource::IN::A.new('192.0.2.42')])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
|
|
||||||
subject.validate(user)
|
subject.validate(user)
|
||||||
expect(user.errors).to_not have_received(:add)
|
expect(user.errors).to_not have_received(:add)
|
||||||
@ -58,13 +47,7 @@ describe EmailMxValidator do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'adds an error if the email domain name contains empty labels' do
|
it 'adds an error if the email domain name contains empty labels' do
|
||||||
resolver = instance_double(Resolv::DNS)
|
configure_resolver('example..com', a: resolv_double_a('192.0.2.42'))
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::MX).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::A).and_return([Resolv::DNS::Resource::IN::A.new('192.0.2.42')])
|
|
||||||
allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
|
|
||||||
user = instance_double(User, email: 'foo@example..com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil))
|
user = instance_double(User, email: 'foo@example..com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil))
|
||||||
subject.validate(user)
|
subject.validate(user)
|
||||||
@ -72,30 +55,15 @@ describe EmailMxValidator do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'adds an error if there are no DNS records for the e-mail domain' do
|
it 'adds an error if there are no DNS records for the e-mail domain' do
|
||||||
resolver = instance_double(Resolv::DNS)
|
configure_resolver('example.com')
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
|
|
||||||
subject.validate(user)
|
subject.validate(user)
|
||||||
expect(user.errors).to have_received(:add)
|
expect(user.errors).to have_received(:add)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'adds an error if a MX record does not lead to an IP' do
|
it 'adds an error if a MX record does not lead to an IP' do
|
||||||
resolver = instance_double(Resolv::DNS)
|
configure_resolver('example.com', mx: resolv_double_mx('mail.example.com'))
|
||||||
|
configure_resolver('mail.example.com')
|
||||||
allow(resolver).to receive(:getresources)
|
|
||||||
.with('example.com', Resolv::DNS::Resource::IN::MX)
|
|
||||||
.and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
|
|
||||||
subject.validate(user)
|
subject.validate(user)
|
||||||
expect(user.errors).to have_received(:add)
|
expect(user.errors).to have_received(:add)
|
||||||
@ -103,20 +71,48 @@ describe EmailMxValidator do
|
|||||||
|
|
||||||
it 'adds an error if the MX record is blacklisted' do
|
it 'adds an error if the MX record is blacklisted' do
|
||||||
EmailDomainBlock.create!(domain: 'mail.example.com')
|
EmailDomainBlock.create!(domain: 'mail.example.com')
|
||||||
resolver = instance_double(Resolv::DNS)
|
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources)
|
configure_resolver(
|
||||||
.with('example.com', Resolv::DNS::Resource::IN::MX)
|
'example.com',
|
||||||
.and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
|
mx: resolv_double_mx('mail.example.com')
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
|
)
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
configure_resolver(
|
||||||
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
|
'mail.example.com',
|
||||||
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
|
a: instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5'),
|
||||||
allow(resolver).to receive(:timeouts=).and_return(nil)
|
aaaa: instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
)
|
||||||
|
|
||||||
subject.validate(user)
|
subject.validate(user)
|
||||||
expect(user.errors).to have_received(:add)
|
expect(user.errors).to have_received(:add)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def configure_resolver(domain, options = {})
|
||||||
|
allow(resolv_dns_double)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(domain, Resolv::DNS::Resource::IN::MX)
|
||||||
|
.and_return(Array(options[:mx]))
|
||||||
|
allow(resolv_dns_double)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(domain, Resolv::DNS::Resource::IN::A)
|
||||||
|
.and_return(Array(options[:a]))
|
||||||
|
allow(resolv_dns_double)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(domain, Resolv::DNS::Resource::IN::AAAA)
|
||||||
|
.and_return(Array(options[:aaaa]))
|
||||||
|
allow(resolv_dns_double)
|
||||||
|
.to receive(:timeouts=)
|
||||||
|
.and_return(nil)
|
||||||
|
allow(Resolv::DNS)
|
||||||
|
.to receive(:open)
|
||||||
|
.and_yield(resolv_dns_double)
|
||||||
|
end
|
||||||
|
|
||||||
|
def resolv_double_mx(domain)
|
||||||
|
instance_double(Resolv::DNS::Resource::MX, exchange: domain)
|
||||||
|
end
|
||||||
|
|
||||||
|
def resolv_double_a(domain)
|
||||||
|
Resolv::DNS::Resource::IN::A.new(domain)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user