From 51eb1115035499a47bb03670c03afbd03ce7c5ac Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 8 Jan 2020 22:42:05 +0100 Subject: [PATCH] Allow blocking TLDs, and fix TLD blocks not being editable (#12805) Fixes #12795 It was already possible to create domain blocks for TLDs, but those weren't enforced, nor editable. This commit changes it so that they are enforced and editable. --- app/models/domain_block.rb | 2 +- spec/models/domain_block_spec.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 4e865b850a9..f0a5bd296bc 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -54,7 +54,7 @@ class DomainBlock < ApplicationRecord segments = uri.normalized_host.split('.') variants = segments.map.with_index { |_, i| segments[i..-1].join('.') } - where(domain: variants[0..-2]).order(Arel.sql('char_length(domain) desc')).first + where(domain: variants).order(Arel.sql('char_length(domain) desc')).first end end diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb index d98c5e11863..28647dc89c6 100644 --- a/spec/models/domain_block_spec.rb +++ b/spec/models/domain_block_spec.rb @@ -52,6 +52,16 @@ RSpec.describe DomainBlock, type: :model do block = Fabricate(:domain_block, domain: 'sub.example.com') expect(DomainBlock.rule_for('sub.example.com')).to eq block end + + it 'returns a rule matching a blocked TLD' do + block = Fabricate(:domain_block, domain: 'google') + expect(DomainBlock.rule_for('google')).to eq block + end + + it 'returns a rule matching a subdomain of a blocked TLD' do + block = Fabricate(:domain_block, domain: 'google') + expect(DomainBlock.rule_for('maps.google')).to eq block + end end describe '#stricter_than?' do