rails_hq_ip_whitelist 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8486ccbafd8b0e0fa4199540ecfd7d5e8c2bbe28
-  data.tar.gz: 964eb8c9707489fb2e155ef3649ce7a142ec279d
+  metadata.gz: ad1edcc6fc6d4bf7a610f1e57983ceb770f6b783
+  data.tar.gz: 2239c99a2a552fbf19243b886e712aaa87e29a1f
 SHA512:
-  metadata.gz: 77be7c860f617a7d0b38f926b479f4a603be0bd2b5ce0e592cae843158d15b820ed85d7d4407cf8ebd2389adda7fe8ddbfa7ad601b4d5bffa26750463eee9404
-  data.tar.gz: 01374c7f940f26bd6450ed948ac36c0041e2b4f5542e8ce4469027621882528f14bb51b1df63baa29a396c4ec2e1734f73b4675031b431aa8cb6c81ac2dcf48c
+  metadata.gz: 208d3729063a0c1bbc8ce78d48d31fd4a8cbaa911d7c11191acb41a3a7548138352a3ebc499549053e4a6f3e66f6b4f89f7cd8954f864a1dc7e16512d4eb4d5f
+  data.tar.gz: 8b0157cc41c8ae3a2b55a792fbe3ed7457c505479416a893da5616ba7ccc852458939db894af17bd297aacdd723762de0e266c3873def2b69016b03e0a919816

data/lib/ip_whitelist/controller.rb

@@ -3,9 +3,19 @@ module IPWhitelist
     def check_ip_whitelist
       if current_user && current_user.respond_to?(:ip_whitelist) && current_user.ip_whitelist.present?
         # Since requests can come through cloudflare, try that IP first.
-        ip = request.headers["CF-Connecting-IP"] || request.headers["REMOTE_ADDR"]
-        return if current_user.ip_whitelist.map(&:to_s).include?(ip)
-        render text: "Not Authorized", status: 401
+        ip = IPAddr.new(request.headers["CF-Connecting-IP"] || request.headers["REMOTE_ADDR"])
+
+        return if current_user.ip_whitelist.detect{ |ip_or_range|
+          # Check if the IP is equal to the whitelisted IP, or is within the
+          # whitelisted IP range.
+          (ip_or_range.is_a?(IPAddr) ? ip_or_range : IPAddr.new(ip_or_range)) === ip
+        }
+
+        if redirect = IPWhitelist.configuration.redirect
+          redirect_to redirect
+        else
+          render text: "Not Authorized", status: 401
+        end
       end
     end
   end

data/lib/ip_whitelist/version.rb

@@ -1,3 +1,3 @@
 module IPWhitelist
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/rails_hq_ip_whitelist.rb

@@ -1,4 +1,17 @@
 require "ip_whitelist/controller"
-module RailsHQIPList
+module IPWhitelist
+  Configuration = Struct.new(:redirect)
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_hq_ip_whitelist
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Brendan Carney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails