mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-05 06:26:21 +00:00
a29a982eaa
* Change e-mail domain blocks to block IPs dynamically * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
136 lines
7.2 KiB
Ruby
136 lines
7.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe EmailMxValidator do
|
|
describe '#validate' do
|
|
let(:user) { double(email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: double(add: nil)) }
|
|
|
|
context 'for an e-mail domain that is explicitly allowed' do
|
|
around do |block|
|
|
tmp = Rails.configuration.x.email_domains_whitelist
|
|
Rails.configuration.x.email_domains_whitelist = 'example.com'
|
|
block.call
|
|
Rails.configuration.x.email_domains_whitelist = tmp
|
|
end
|
|
|
|
it 'does not add errors if there are no DNS records' do
|
|
resolver = double
|
|
|
|
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)
|
|
expect(user.errors).to_not have_received(:add)
|
|
end
|
|
end
|
|
|
|
it 'adds an error if there are no DNS records for the e-mail domain' do
|
|
resolver = double
|
|
|
|
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)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
|
|
it 'adds an error if a MX record does not lead to an IP' do
|
|
resolver = double
|
|
|
|
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(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)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
|
|
it 'adds an error if the A record is blacklisted' do
|
|
EmailDomainBlock.create!(domain: 'alternate-example.com', ips: ['1.2.3.4'])
|
|
resolver = double
|
|
|
|
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([double(address: '1.2.3.4')])
|
|
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)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
|
|
it 'adds an error if the AAAA record is blacklisted' do
|
|
EmailDomainBlock.create!(domain: 'alternate-example.com', ips: ['fd00::1'])
|
|
resolver = double
|
|
|
|
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([double(address: 'fd00::1')])
|
|
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
|
|
subject.validate(user)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
|
|
it 'adds an error if the A record of the MX record is blacklisted' do
|
|
EmailDomainBlock.create!(domain: 'mail.other-domain.com', ips: ['2.3.4.5'])
|
|
resolver = double
|
|
|
|
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(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([double(address: '2.3.4.5')])
|
|
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)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
|
|
it 'adds an error if the AAAA record of the MX record is blacklisted' do
|
|
EmailDomainBlock.create!(domain: 'mail.other-domain.com', ips: ['fd00::2'])
|
|
resolver = double
|
|
|
|
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(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([double(address: 'fd00::2')])
|
|
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
|
|
subject.validate(user)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
|
|
it 'adds an error if the MX record is blacklisted' do
|
|
EmailDomainBlock.create!(domain: 'mail.example.com')
|
|
resolver = double
|
|
|
|
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([double(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([double(address: '2.3.4.5')])
|
|
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([double(address: 'fd00::2')])
|
|
allow(resolver).to receive(:timeouts=).and_return(nil)
|
|
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
|
|
subject.validate(user)
|
|
expect(user.errors).to have_received(:add)
|
|
end
|
|
end
|
|
end
|