mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-25 07:37:08 +09:00
Code

Fix uncaught ActiveRecord::StatementInvalid in Mastodon::IpBlocksCLI (#24861)

Browse Source
This commit is contained in:
Daniel M Brasil 2023-05-09 09:45:47 -03:00 committed by GitHub
parent aec486b4ec
commit ffb3fef7db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/mastodon/ip_blocks_cli.rb
View File

@ -36,6 +36,12 @@ module Mastodon
failed = 0
addresses.each do |address|
unless valid_ip_address?(address)
say("#{address} is invalid", :red)
failed += 1
next
end
ip_block = IpBlock.find_by(ip: address)
if ip_block.present? && !options[:force]
@ -79,6 +85,12 @@ module Mastodon
skipped = 0
addresses.each do |address|
unless valid_ip_address?(address)
say("#{address} is invalid", :yellow)
skipped += 1
next
end
ip_blocks = if options[:force]
IpBlock.where('ip >>= ?', address)
else
@ -126,5 +138,12 @@ module Mastodon
:red
end
end
def valid_ip_address?(ip_address)
IPAddr.new(ip_address)
true
rescue IPAddr::InvalidAddressError
false
end
end
end