firewall_constraint 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 502e9d611ee75a4ff89fec91897d9a87a85fb7f6
-  data.tar.gz: 79dd258d71e248fc4eb5ffe37965ca9dab1b2d3b
+  metadata.gz: 786a5e354a3b127d518c2cd08b4b4e012200a8e5
+  data.tar.gz: 6fac23e20cb5f56ccf5dcb95f5bafb1ed949b758
 SHA512:
-  metadata.gz: 3594f8cce23a0db8275ee5715baa423097bf2eb0c489b4213b998cc90aed7641d5bec1daa40aa18b5838d32d1d29840465ef2bc8d4fcd4437546815c75283648
-  data.tar.gz: caf17eb249c6ab734ee0e0acb820b076fcec102136697cdddfe8e592fc9e6056c1b292702b01e6f0a99e875707aa06280de6e852b8ffa8fc5c4ea92c1c8cc3ab
+  metadata.gz: a48dfa6057c90b4a28b5ed25e2b5e0ebc398c80df625b1366a8596d2bcf9cc27bf84ec41e4e5aca708ac6a9b0008df0a20400145d2a0003eec61478b1aa9e678
+  data.tar.gz: 79bf725b17d5eb602d4c7a215fc91e1df6107d36d6fd793263775c12e3f285f9c7a0e8d7f837d68e1288383b2e2fb990a973d0c8aff3139a5a2e101265065371

data/lib/firewall_constraint.rb

@@ -13,9 +13,13 @@ module FirewallConstraint
       end
     end
 
+    def requestor_ip(request)
+      request.env["HTTP_X_FORWARDED_FOR"] ? request.env["HTTP_X_FORWARDED_FOR"].split(/, /).first : request.remote_ip
+    end
+
     def matches?(request)
       return true if parsed_ips.empty?
-      client_ip = IPAddress::parse(request.env["HTTP_X_FORWARDED_FOR"] ? request.env["HTTP_X_FORWARDED_FOR"] : request.remote_ip)
+      client_ip = IPAddress::parse requestor_ip(request)
       parsed_ips.each do |ip|
         begin
           return true if ip.include?(client_ip)

data/lib/firewall_constraint/version.rb

@@ -1,3 +1,3 @@
 module FirewallConstraint
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/requests/dummy_controller_spec.rb

@@ -7,7 +7,7 @@ describe "DummyController", type: :request do
   end
   
   it 'should get dynamic constraint' do
-    get root_path, nil, "REMOTE_ADDR" => "127.0.0.1"
+    get root_path
     open_session do |sess|
       sess.remote_addr = '127.0.0.1'
       get '/dummy/blocked_by_dynamic'
@@ -16,7 +16,7 @@ describe "DummyController", type: :request do
   end
   
   it 'should get procced constraint' do
-    get root_path, nil, "REMOTE_ADDR" => "127.0.0.1"
+    get root_path
     open_session do |sess|
       sess.remote_addr = '127.0.0.1'
       get '/dummy/blocked_by_proc'
@@ -26,7 +26,7 @@ describe "DummyController", type: :request do
 
   it 'should get ipv6 constraint' do
     ipv6 = 'fe80::d69a:20ff:fe0d:45fe'
-    get root_path, nil, "REMOTE_ADDR" => ipv6
+    get root_path
     open_session do |sess|
       sess.remote_addr = ipv6
       get '/dummy/blocked_by_ipv6'
@@ -38,7 +38,7 @@ describe "DummyController", type: :request do
   context 'given a bad ipv6 ip' do
     around do |example|
       ipv6 = 'fe80::d69a:20ff:fe0d:45ff'
-      get root_path, nil, "REMOTE_ADDR" => ipv6
+      get root_path
       open_session do |sess|
         sess.remote_addr = ipv6
         example.run
@@ -56,16 +56,26 @@ describe "DummyController", type: :request do
   
   it 'should not vomit given a bad ipv6 ip' do
     ipv6 = 'fe80::d69a:20ff:fe0d:45fe'
-    get root_path, nil, "REMOTE_ADDR" => ipv6
+    get root_path
     open_session do |sess|
       sess.remote_addr = ipv6
       expect {get '/dummy/blocked_by_block'}.to raise_error ActionController::RoutingError
     end
   end
+
+  it 'should not vomit given a list of IPs in HTTP_X_FORWARDED_FOR -- and should look at the leftmost IP in the list' do
+    ip_list = '1.2.3.4, 10.0.0.1'
+    get root_path
+    open_session do |sess|
+      sess.remote_addr = ip_list
+      expect {get '/dummy/blocked_by_block', nil, {"HTTP_X_FORWARDED_FOR" => ip_list}}.to raise_error ActionController::RoutingError
+    end
+  end
+
   
   context 'given a good ip' do
     around do |example|
-      get root_path, nil, "REMOTE_ADDR" => "10.0.0.45"
+      get root_path
       open_session do |sess|
         sess.remote_addr = '10.0.0.45'
         example.run
@@ -85,7 +95,7 @@ describe "DummyController", type: :request do
   
   context 'given a bad ip' do
     around do |example|
-      get root_path, nil, "REMOTE_ADDR" => "55.55.55.55"
+      get root_path
       open_session do |sess|
         sess.remote_addr = '55.55.55.55'
         example.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firewall_constraint
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Auclair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails