mirror of
https://github.com/internetee/registry.git
synced 2025-07-23 11:16:00 +02:00
Fixed validations
This commit is contained in:
parent
a6b6a3e60a
commit
5cc85980d4
2 changed files with 33 additions and 5 deletions
|
@ -2,8 +2,8 @@ class WhiteIp < ApplicationRecord
|
||||||
include Versions
|
include Versions
|
||||||
belongs_to :registrar
|
belongs_to :registrar
|
||||||
|
|
||||||
validates :ipv4, format: { with: /\A(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\z/, allow_blank: true }
|
validate :valid_ipv4?
|
||||||
validates :ipv6, format: { with: /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/, allow_blank: true }
|
validate :valid_ipv6?
|
||||||
|
|
||||||
validate :validate_ipv4_and_ipv6
|
validate :validate_ipv4_and_ipv6
|
||||||
def validate_ipv4_and_ipv6
|
def validate_ipv4_and_ipv6
|
||||||
|
@ -11,6 +11,22 @@ class WhiteIp < ApplicationRecord
|
||||||
errors.add(:base, I18n.t(:ipv4_or_ipv6_must_be_present))
|
errors.add(:base, I18n.t(:ipv4_or_ipv6_must_be_present))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def valid_ipv4?
|
||||||
|
return if ipv4.blank?
|
||||||
|
|
||||||
|
IPAddr.new(ipv4, Socket::AF_INET)
|
||||||
|
rescue StandardError => _e
|
||||||
|
errors.add(:ipv4, :invalid)
|
||||||
|
end
|
||||||
|
|
||||||
|
def valid_ipv6?
|
||||||
|
return if ipv6.blank?
|
||||||
|
|
||||||
|
IPAddr.new(ipv6, Socket::AF_INET6)
|
||||||
|
rescue StandardError => _e
|
||||||
|
errors.add(:ipv6, :invalid)
|
||||||
|
end
|
||||||
|
|
||||||
API = 'api'
|
API = 'api'
|
||||||
REGISTRAR = 'registrar'
|
REGISTRAR = 'registrar'
|
||||||
INTERFACES = [API, REGISTRAR]
|
INTERFACES = [API, REGISTRAR]
|
||||||
|
@ -23,11 +39,13 @@ class WhiteIp < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
|
# rubocop:disable Style/CaseEquality
|
||||||
def include_ip?(ip)
|
def include_ip?(ip)
|
||||||
ipv4 = select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === IPAddr.new(ip) }
|
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) }
|
ipv6 = select { |white_ip| IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === IPAddr.new(ip) }
|
||||||
ids = (ipv4.pluck(:id) + ipv6.pluck(:id)).flatten.uniq
|
ids = (ipv4 + ipv6).pluck(:id).flatten.uniq
|
||||||
where(id: ids).any?
|
where(id: ids).any?
|
||||||
end
|
end
|
||||||
|
# rubocop:enable Style/CaseEquality
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -29,6 +29,16 @@ class RegistrarAreaBaseTestTest < ApplicationSystemTestCase
|
||||||
assert_button 'Login'
|
assert_button 'Login'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_user_can_access_when_ip_is_whitelisted_with_subnet
|
||||||
|
white_ips(:one).update!(ipv4: '127.0.0.1/32', interfaces: [WhiteIp::REGISTRAR])
|
||||||
|
Setting.registrar_ip_whitelist_enabled = true
|
||||||
|
|
||||||
|
visit new_registrar_user_session_url
|
||||||
|
|
||||||
|
assert_no_text 'Access denied from IP 127.0.0.1'
|
||||||
|
assert_button 'Login'
|
||||||
|
end
|
||||||
|
|
||||||
def test_user_can_access_when_ip_is_not_whitelisted_and_whitelist_is_disabled
|
def test_user_can_access_when_ip_is_not_whitelisted_and_whitelist_is_disabled
|
||||||
Setting.registrar_ip_whitelist_enabled = false
|
Setting.registrar_ip_whitelist_enabled = false
|
||||||
WhiteIp.delete_all
|
WhiteIp.delete_all
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue