From 0a238f34b39b606d5f20e1ef1fbdd2a8c56951db Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 22 Jun 2019 00:13:10 +0200
Subject: port tootsuite#11138 to monsterfork: Change domain blocks to
automatically support subdomains
* Change domain blocks to automatically support subdomains
If a more authoritative domain is blocked (example.com), then the
same block will be applied to a subdomain (foo.example.com)
* Match subdomains of existing accounts when blocking/unblocking domains
* Improve code style
---
spec/models/domain_block_spec.rb | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
(limited to 'spec')
diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb
index 0035fd0ff..d98c5e118 100644
--- a/spec/models/domain_block_spec.rb
+++ b/spec/models/domain_block_spec.rb
@@ -21,23 +21,40 @@ RSpec.describe DomainBlock, type: :model do
end
end
- describe 'blocked?' do
+ describe '.blocked?' do
it 'returns true if the domain is suspended' do
- Fabricate(:domain_block, domain: 'domain', severity: :suspend)
- expect(DomainBlock.blocked?('domain')).to eq true
+ Fabricate(:domain_block, domain: 'example.com', severity: :suspend)
+ expect(DomainBlock.blocked?('example.com')).to eq true
end
it 'returns false even if the domain is silenced' do
- Fabricate(:domain_block, domain: 'domain', severity: :silence)
- expect(DomainBlock.blocked?('domain')).to eq false
+ Fabricate(:domain_block, domain: 'example.com', severity: :silence)
+ expect(DomainBlock.blocked?('example.com')).to eq false
end
it 'returns false if the domain is not suspended nor silenced' do
- expect(DomainBlock.blocked?('domain')).to eq false
+ expect(DomainBlock.blocked?('example.com')).to eq false
end
end
- describe 'stricter_than?' do
+ describe '.rule_for' do
+ it 'returns rule matching a blocked domain' do
+ block = Fabricate(:domain_block, domain: 'example.com')
+ expect(DomainBlock.rule_for('example.com')).to eq block
+ end
+
+ it 'returns a rule matching a subdomain of a blocked domain' do
+ block = Fabricate(:domain_block, domain: 'example.com')
+ expect(DomainBlock.rule_for('sub.example.com')).to eq block
+ end
+
+ it 'returns a rule matching a blocked subdomain' do
+ block = Fabricate(:domain_block, domain: 'sub.example.com')
+ expect(DomainBlock.rule_for('sub.example.com')).to eq block
+ end
+ end
+
+ describe '#stricter_than?' do
it 'returns true if the new block has suspend severity while the old has lower severity' do
suspend = DomainBlock.new(domain: 'domain', severity: :suspend)
silence = DomainBlock.new(domain: 'domain', severity: :silence)
--
cgit