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

Check API whitelist IP-s when loggin into registrar with pw #2713

Browse source
This commit is contained in:
Martin Lensment 2015-08-14 17:34:05 +03:00
parent 8bffdbf783
commit d26dd3da98
5 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/registrar.rb
View file

@ -45,8 +45,8 @@ class Registrar < ActiveRecord::Base
end
end
validates :email, :billing_email,
email_format: { message: :invalid },
validates :email, :billing_email,
email_format: { message: :invalid },
allow_blank: true, if: proc { |c| c.email_changed? }
WHOIS_TRIGGERS = %w(name email phone street city state zip)
@ -165,15 +165,11 @@ class Registrar < ActiveRecord::Base
def api_ip_white?(ip)
return true unless Setting.api_ip_whitelist_enabled
white_ips.api.pluck(:ipv4, :ipv6).flatten.include?(ip) || global_ip_white?(ip)
white_ips.api.pluck(:ipv4, :ipv6).flatten.include?(ip)
end
def registrar_ip_white?(ip)
return true unless Setting.registrar_ip_whitelist_enabled
white_ips.registrar.pluck(:ipv4, :ipv6).flatten.include?(ip) || global_ip_white?(ip)
end
def global_ip_white?(ip)
white_ips.global.pluck(:ipv4, :ipv6).flatten.include?(ip)
white_ips.registrar.pluck(:ipv4, :ipv6).flatten.include?(ip)
end
end