zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix error handling in processing request IP"

Browse source 
This reverts commit 5a82d7c2c0.
This commit is contained in:
Alex Sherman 2020-11-23 17:24:52 +05:00
parent 5a82d7c2c0
commit bace495f57
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/white_ip.rb
View file

@ -41,15 +41,10 @@ class WhiteIp < ApplicationRecord
class << self
# rubocop:disable Style/CaseEquality
def include_ip?(ip)
new_ip4 = IPAddr.new(ip, Socket::AF_INET)
new_ip6 = IPAddr.new(ip, Socket::AF_INET6)
result = self.all.select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === new_ip4 ||
IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === new_ip6 }
ids = result.pluck(:id).flatten.uniq
ipv4 = select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === IPAddr.new(ip) }
ipv6 = select { |white_ip| IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === IPAddr.new(ip) }
ids = (ipv4 + ipv6).pluck(:id).flatten.uniq
where(id: ids).any?
rescue IPAddr::InvalidAddressError => _e
false
end
# rubocop:enable Style/CaseEquality
end