searchable: fix searching for invalid IP addresses.
Fix an ArgumentError exception when searching for an invalid IP address. Also allow searching for multiple subnets at once.
This commit is contained in:
@@ -71,11 +71,13 @@ module Searchable
|
||||
|
||||
def where_inet_matches(attr, value)
|
||||
if value.match?(/[, ]/)
|
||||
ips = value.split(/[, ]+/).map { |ip| Danbooru::IpAddress.new(ip).to_string }
|
||||
where("#{qualified_column_for(attr)} = ANY(ARRAY[?]::inet[])", ips)
|
||||
ips = value.split(/[, ]+/).map { |ip| Danbooru::IpAddress.parse(ip).to_s }
|
||||
return none if ips.any?(&:blank?)
|
||||
where("#{qualified_column_for(attr)} <<= ANY(ARRAY[?]::inet[])", ips)
|
||||
else
|
||||
ip = Danbooru::IpAddress.new(value)
|
||||
where("#{qualified_column_for(attr)} <<= ?", ip.to_string)
|
||||
ip = Danbooru::IpAddress.parse(value)
|
||||
return none if ip.nil?
|
||||
where("#{qualified_column_for(attr)} <<= ?", ip.to_s)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -9,6 +9,12 @@ module Danbooru
|
||||
delegate :ipv4?, :ipv6?, :loopback?, :link_local?, :unique_local?, :private?, :to_string, :network, :prefix, :multicast?, :unspecified?, to: :ip_address
|
||||
delegate :ip_info, :is_proxy?, to: :ip_lookup
|
||||
|
||||
def self.parse(string)
|
||||
new(string)
|
||||
rescue
|
||||
nil
|
||||
end
|
||||
|
||||
def initialize(string)
|
||||
@ip_address = ::IPAddress.parse(string.to_s.strip)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user