Refactor IP registrar restriction

#600

app/models/authorization/restricted_ip.rb

@@ -0,0 +1,25 @@
+module Authorization
+  class RestrictedIP
+    def initialize(ip)
+      @ip = ip
+    end
+
+    def self.enabled?
+      Setting.registrar_ip_whitelist_enabled
+    end
+
+    def can_access_registrar_area?(registrar)
+      return true unless self.class.enabled?
+      registrar.white_ips.registrar_area.include_ip?(ip)
+    end
+
+    def can_access_registrar_area_sign_in_page?
+      return true unless self.class.enabled?
+      WhiteIp.registrar_area.include_ip?(ip)
+    end
+
+    private
+
+    attr_reader :ip
+  end
+end

app/models/registrar.rb

@@ -162,9 +162,4 @@ class Registrar < ActiveRecord::Base
     return true unless Setting.api_ip_whitelist_enabled
     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)
-  end
 end

app/models/white_ip.rb

@@ -18,16 +18,15 @@ class WhiteIp < ActiveRecord::Base
   INTERFACES = [API, REGISTRAR]
 
   scope :api, -> { where("interfaces @> ?::varchar[]", "{#{API}}") }
-  scope :registrar, -> { where("interfaces @> ?::varchar[]", "{#{REGISTRAR}}") }
+  scope :registrar_area, -> { where("interfaces @> ?::varchar[]", "{#{REGISTRAR}}") }
 
   def interfaces=(interfaces)
     super(interfaces.reject(&:blank?))
   end
 
   class << self
-    def registrar_ip_white?(ip)
-      return true unless Setting.registrar_ip_whitelist_enabled
-      WhiteIp.where(ipv4: ip).registrar.any?
+    def include_ip?(ip)
+      where("#{table_name}.ipv4 = '#{ip}' OR #{table_name}.ipv6 = '#{ip}'").any?
     end
   end
 end