Merge branch '1833-adding-only-ipv6-with-empty-ipv4' of https://github.com/internetee/registry into 1833-adding-only-ipv6-with-empty-ipv4

This commit is contained in:
Oleg Hasjanov 2021-02-05 10:36:11 +02:00
commit 0fc66994a4

View file

@ -50,10 +50,10 @@ class WhiteIp < ApplicationRecord
def ids_including(ip)
ipv4 = ipv6 = []
if check_ip4(ip).present?
ipv4 = select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === check_ip4(ip) }
ipv4 = select { |white_ip| check_ip4(white_ip.ipv4) === check_ip4(ip) }
end
if check_ip6(ip).present?
ipv6 = select { |white_ip| IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === check_ip6(ip) }
ipv6 = select { |white_ip| check_ip6(white_ip.ipv6) === check_ip6(ip) }
end
(ipv4 + ipv6).pluck(:id).flatten.uniq
end