zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-22 18:56:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

CC fixes

Browse source
This commit is contained in:
Alex Sherman 2020-11-24 13:19:08 +05:00
parent 3943628716
commit 708e87f5a7
3 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/authorization/restricted_ip.rb
View file

@ -14,9 +14,7 @@ module Authorization
end end
def can_access_registrar_area_sign_in_page? def can_access_registrar_area_sign_in_page?
Rails.logger.info "Checking if Auth::RestrictedIp.enabled: #{self.class.enabled?}"
return true unless self.class.enabled? return true unless self.class.enabled?
Rails.logger.info "Checking if registrar area accessible, result: #{WhiteIp.registrar_area.include_ip?(ip)}"
WhiteIp.registrar_area.include_ip?(ip) WhiteIp.registrar_area.include_ip?(ip)
end end

2
app/models/registrar.rb
View file

@ -137,7 +137,7 @@ class Registrar < ApplicationRecord
def api_ip_white?(ip) def api_ip_white?(ip)
return true unless Setting.api_ip_whitelist_enabled return true unless Setting.api_ip_whitelist_enabled
# white_ips.api.pluck(:ipv4, :ipv6).flatten.include?(ip)
white_ips.api.include_ip?(ip) white_ips.api.include_ip?(ip)
end end

13
app/models/white_ip.rb
View file

@ -40,17 +40,14 @@ class WhiteIp < ApplicationRecord
class << self class << self
# rubocop:disable Style/CaseEquality # rubocop:disable Style/CaseEquality
# rubocop:disable Metrics/AbcSize
def include_ip?(ip) def include_ip?(ip)
Rails.logger.info "Checking if whitelist includes ip: #{ip}"
return false if ip.blank? return false if ip.blank?
result = where(id: ids_including(ip)).any? where(id: ids_including(ip)).any?
Rails.logger.info "Result is: #{result}"
result
end end
def ids_including(ip) def ids_including(ip)
Rails.logger.info "Checking ip #{ip}"
ipv4 = ipv6 = [] ipv4 = ipv6 = []
if check_ip4(ip).present? if check_ip4(ip).present?
ipv4 = select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === check_ip4(ip) } ipv4 = select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === check_ip4(ip) }
@ -58,11 +55,10 @@ class WhiteIp < ApplicationRecord
if check_ip6(ip).present? if check_ip6(ip).present?
ipv6 = select { |white_ip| IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === check_ip6(ip) } ipv6 = select { |white_ip| IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === check_ip6(ip) }
end end
result = (ipv4 + ipv6).pluck(:id).flatten.uniq (ipv4 + ipv6).pluck(:id).flatten.uniq
Rails.logger.info "Result is #{result}"
result
end end
# rubocop:enable Style/CaseEquality # rubocop:enable Style/CaseEquality
# rubocop:enable Metrics/AbcSize
def check_ip4(ip) def check_ip4(ip)
IPAddr.new(ip, Socket::AF_INET) IPAddr.new(ip, Socket::AF_INET)
@ -75,6 +71,5 @@ class WhiteIp < ApplicationRecord
rescue StandardError => _e rescue StandardError => _e
nil nil
end end
end end
end end