Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add IpBlock#to_cidr method to build string (#35773)

Browse Source
This commit is contained in:
Matt Jankowski
2025-11-17 09:51:05 -05:00
committed by GitHub
parent 59fdff5dc5
commit 53703202fb
7 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spec/lib/mastodon/cli/ip_blocks_spec.rb
View File

@@ -251,12 +251,12 @@ RSpec.describe Mastodon::CLI::IpBlocks do
it 'exports blocked IPs with "no_access" severity in plain format' do
expect { subject }
.to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
.to output_results("#{first_ip_range_block.to_cidr}\n#{second_ip_range_block.to_cidr}")
end
it 'does not export blocked IPs with different severities' do
expect { subject }
.to_not output_results("#{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}")
.to_not output_results(third_ip_range_block.to_cidr)
end
end
@@ -265,19 +265,19 @@ RSpec.describe Mastodon::CLI::IpBlocks do
it 'exports blocked IPs with "no_access" severity in plain format' do
expect { subject }
.to output_results("deny #{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};\ndeny #{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix};")
.to output_results("deny #{first_ip_range_block.to_cidr};\ndeny #{second_ip_range_block.to_cidr};")
end
it 'does not export blocked IPs with different severities' do
expect { subject }
.to_not output_results("deny #{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};")
.to_not output_results("deny #{third_ip_range_block.to_cidr};")
end
end
context 'when --format option is not provided' do
it 'exports blocked IPs in plain format by default' do
expect { subject }
.to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
.to output_results("#{first_ip_range_block.to_cidr}\n#{second_ip_range_block.to_cidr}")
end
end
end

16
spec/models/ip_block_spec.rb
View File

@@ -26,6 +26,22 @@ RSpec.describe IpBlock do
end
end
describe '#to_cidr' do
subject { Fabricate.build(:ip_block, ip:).to_cidr }
context 'with an IP and a specified prefix' do
let(:ip) { '192.168.1.0/24' }
it { is_expected.to eq('192.168.1.0/24') }
end
context 'with an IP and a default prefix' do
let(:ip) { '192.168.1.0' }
it { is_expected.to eq('192.168.1.0/32') }
end
end
describe '.blocked?' do
context 'when the IP is blocked' do
it 'returns true' do

4
spec/requests/api/v1/admin/ip_blocks_spec.rb
View File

@@ -97,7 +97,7 @@ RSpec.describe 'IP Blocks' do
expect(response.parsed_body)
.to include(
ip: eq("#{ip_block.ip}/#{ip_block.ip.prefix}"),
ip: eq(ip_block.to_cidr),
severity: eq(ip_block.severity.to_s)
)
end
@@ -216,7 +216,7 @@ RSpec.describe 'IP Blocks' do
expect(response.content_type)
.to start_with('application/json')
expect(response.parsed_body).to match(hash_including({
ip: "#{ip_block.ip}/#{ip_block.ip.prefix}",
ip: ip_block.to_cidr,
severity: 'sign_up_requires_approval',
comment: 'Decreasing severity',
}))