Change e-mail domain blocks to match subdomains of blocked domains (#18979)
parent
d83faa1a89
commit
0412a4d03e
|
@ -30,8 +30,40 @@ class EmailDomainBlock < ApplicationRecord
|
|||
@history ||= Trends::History.new('email_domain_blocks', id)
|
||||
end
|
||||
|
||||
def self.block?(domain_or_domains, attempt_ip: nil)
|
||||
domains = Array(domain_or_domains).map do |str|
|
||||
class Matcher
|
||||
def initialize(domain_or_domains, attempt_ip: nil)
|
||||
@uris = extract_uris(domain_or_domains)
|
||||
@attempt_ip = attempt_ip
|
||||
end
|
||||
|
||||
def match?
|
||||
blocking? || invalid_uri?
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def invalid_uri?
|
||||
@uris.any?(&:nil?)
|
||||
end
|
||||
|
||||
def blocking?
|
||||
blocks = EmailDomainBlock.where(domain: domains_with_variants).order(Arel.sql('char_length(domain) desc'))
|
||||
blocks.each { |block| block.history.add(@attempt_ip) } if @attempt_ip.present?
|
||||
blocks.any?
|
||||
end
|
||||
|
||||
def domains_with_variants
|
||||
@uris.flat_map do |uri|
|
||||
next if uri.nil?
|
||||
|
||||
segments = uri.normalized_host.split('.')
|
||||
|
||||
segments.map.with_index { |_, i| segments[i..-1].join('.') }
|
||||
end
|
||||
end
|
||||
|
||||
def extract_uris(domain_or_domains)
|
||||
Array(domain_or_domains).map do |str|
|
||||
domain = begin
|
||||
if str.include?('@')
|
||||
str.split('@', 2).last
|
||||
|
@ -40,22 +72,14 @@ class EmailDomainBlock < ApplicationRecord
|
|||
end
|
||||
end
|
||||
|
||||
TagManager.instance.normalize_domain(domain) if domain.present?
|
||||
rescue Addressable::URI::InvalidURIError
|
||||
Addressable::URI.new.tap { |u| u.host = domain.strip } if domain.present?
|
||||
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
|
||||
nil
|
||||
end
|
||||
|
||||
# If some of the inputs passed in are invalid, we definitely want to
|
||||
# block the attempt, but we also want to register hits against any
|
||||
# other valid matches
|
||||
|
||||
blocked = domains.any?(&:nil?)
|
||||
|
||||
where(domain: domains).find_each do |block|
|
||||
blocked = true
|
||||
block.history.add(attempt_ip) if attempt_ip.present?
|
||||
end
|
||||
end
|
||||
|
||||
blocked
|
||||
def self.block?(domain_or_domains, attempt_ip: nil)
|
||||
Matcher.new(domain_or_domains, attempt_ip: attempt_ip).match?
|
||||
end
|
||||
end
|
||||
|
|
|
@ -12,7 +12,10 @@ RSpec.describe EmailDomainBlock, type: :model do
|
|||
let(:input) { nil }
|
||||
|
||||
context 'given an e-mail address' do
|
||||
let(:input) { 'nyarn@example.com' }
|
||||
let(:input) { "foo@#{domain}" }
|
||||
|
||||
context do
|
||||
let(:domain) { 'example.com' }
|
||||
|
||||
it 'returns true if the domain is blocked' do
|
||||
Fabricate(:email_domain_block, domain: 'example.com')
|
||||
|
@ -25,6 +28,16 @@ RSpec.describe EmailDomainBlock, type: :model do
|
|||
end
|
||||
end
|
||||
|
||||
context do
|
||||
let(:domain) { 'mail.example.com' }
|
||||
|
||||
it 'returns true if it is a subdomain of a blocked domain' do
|
||||
Fabricate(:email_domain_block, domain: 'example.com')
|
||||
expect(described_class.block?(input)).to be true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'given an array of domains' do
|
||||
let(:input) { %w(foo.com mail.foo.com) }
|
||||
|
||||
|
|
Reference in New Issue