x-real-ip 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7df2ede64048c2ec30a62a05ff96c26c49adb92
-  data.tar.gz: f376fd3dffbc5c0488b926cff92cb6aa9a8d6355
+  metadata.gz: cf291cf813934ff5cea79959fccb44d84318d1e3
+  data.tar.gz: dea854479ed1c78e8b928abd4b9c57286b176152
 SHA512:
-  metadata.gz: 07a95514defa03eefd56548bcbacc03b4304a79c08b22ba81df2c7e64b3464b43fec544194e81ae5161b1985d3719cfb16b801df0ca39abcb82a50e32622b11a
-  data.tar.gz: 8a450481deb313fb77c850f080478bde65861b9b9129bd2aa90d35013902ee6c3abe57459bbae60bf475bc8051866093fcec8349e498dffc6b8102d7819ae09c
+  metadata.gz: fea58c026d438d9b6166dbc89f2db035bec441b3659aac781e11a0d670eaf289a71540e7cef885d5878b8ebf59a6931e918dc2879ea9aa488a41559cb7c4b76d
+  data.tar.gz: 614fc853b2beb3cfec20993faaf87f05b130afcb25810a851dbc29367ad2b2a2230650f8fc92d24accabccb872382958f53cf6d726383a500a0f2ed392fe7c29

data/lib/x-real-ip/middleware.rb

@@ -18,7 +18,10 @@ module XRealIp
       if real_ips
         # for Rails logger
         env["HTTP_X_FORWARDED_FOR"] = real_ips
-        
+      else
+        real_ips  = env["HTTP_X_FORWARDED_FOR"]
+      end
+      if real_ips
         proxies = []
         list = real_ips.split(',')
         return @app.call(env) if list.empty?

data/lib/x-real-ip/version.rb

@@ -1,3 +1,3 @@
 module XRealIp
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/x_forwarded_for_spec.rb

@@ -0,0 +1,168 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe 'X-Forwarded-For' do
+  before :each do
+    app = lambda { |env| @env = env; [ 200, {}, [] ] }
+    @req = Rack::MockRequest.new(XRealIp::Middleware.new(app))
+  end
+
+  context 'no proxy' do
+    context 'local ip' do
+      context 'http' do
+        before :each do
+          env = {
+            "REMOTE_ADDR" => "127.0.0.1",
+          }
+          @resp = @req.get("http://example.com/", env)
+        end
+        it 'sets ip' do
+          @env["REMOTE_ADDR"].should eq '127.0.0.1'
+        end
+        it 'sets proxy ip' do
+          @env["x.proxies"].should be_nil
+        end
+        it 'keeps http' do
+          @env["rack.url_scheme"].should eq 'http'
+        end
+      end
+      context 'https' do
+        before :each do
+          env = {
+            "HTTP_X_FORWARDED_PROTO" => "https",
+            "REMOTE_ADDR" => "127.0.0.1",
+          }
+          @resp = @req.get("http://test.com/", env)
+        end
+        it 'sets ip' do
+          @env["REMOTE_ADDR"].should eq '127.0.0.1'
+        end
+        it 'sets proxy ip' do
+          @env["x.proxies"].should be_nil
+        end
+        it 'keeps http' do
+          @env["rack.url_scheme"].should eq 'http'
+        end
+      end
+    end
+  end
+
+  context 'one proxy' do
+    context 'local ip' do
+      context 'http' do
+        before :each do
+          env = {
+            "HTTP_X_FORWARDED_FOR" => "1.1.1.1",
+            "REMOTE_ADDR" => "127.0.0.1",
+          }
+          @resp = @req.get("http://test.com/", env)
+        end
+        it 'sets ip' do
+          @env["REMOTE_ADDR"].should eq '1.1.1.1'
+        end
+        it 'sets proxy ip' do
+          @env["x.proxies"].should eq '127.0.0.1'
+        end
+        it 'keeps http' do
+          @env["rack.url_scheme"].should eq 'http'
+        end
+      end
+      context 'https' do
+        before :each do
+          env = {
+            "HTTP_X_FORWARDED_FOR" => "1.1.1.1",
+            "HTTP_X_FORWARDED_PROTO" => "https",
+            "REMOTE_ADDR" => "127.0.0.1",
+          }
+          @resp = @req.get("http://test.com/", env)
+        end
+        it 'sets ip' do
+          @env["REMOTE_ADDR"].should eq '1.1.1.1'
+        end
+        it 'sets proxy ip' do
+          @env["x.proxies"].should eq '127.0.0.1'
+        end
+        it 'sets url scheme to https' do
+          @env["rack.url_scheme"].should eq 'https'
+        end
+      end
+    end
+  end
+
+  context '2 proxies' do
+    context 'http' do
+      before :each do
+        env = {
+          "HTTP_X_FORWARDED_FOR" => "1.1.1.1,10.0.0.1",
+          "REMOTE_ADDR" => "127.0.0.1",
+        }
+        @resp = @req.get("http://test.com/", env)
+      end
+      it 'sets ip' do
+        @env["REMOTE_ADDR"].should eq '1.1.1.1'
+      end
+      it 'sets proxy ip' do
+        @env["x.proxies"].should eq '127.0.0.1,10.0.0.1'
+      end
+      it 'keeps http' do
+        @env["rack.url_scheme"].should eq 'http'
+      end
+    end
+    context 'https' do
+      before :each do
+        env = {
+          "HTTP_X_FORWARDED_FOR" => "1.1.1.1,10.0.0.1",
+          "HTTP_X_FORWARDED_PROTO" => "https",
+          "REMOTE_ADDR" => "127.0.0.1",
+        }
+        @resp = @req.get("http://test.com/", env)
+      end
+      it 'sets ip' do
+        @env["REMOTE_ADDR"].should eq '1.1.1.1'
+      end
+      it 'sets proxy ip' do
+        @env["x.proxies"].should eq '127.0.0.1,10.0.0.1'
+      end
+      it 'sets url scheme to https' do
+        @env["rack.url_scheme"].should eq 'https'
+      end
+    end
+  end
+
+  context 'spoofed' do
+    context 'one' do
+      before :each do
+        env = {
+          "HTTP_X_FORWARDED_FOR" => "1.1.1.1,2.2.2.2",
+          "REMOTE_ADDR" => "3.3.3.3",
+        }
+        @resp = @req.get("http://test.com/", env)
+      end
+      it 'sets ip' do
+        @env["REMOTE_ADDR"].should eq '3.3.3.3'
+      end
+      it 'doesnt st proxy ip' do
+        @env["x.proxies"].should eq ''
+      end
+    end
+    context 'chain' do
+      before :each do
+        env = {
+          "HTTP_X_FORWARDED_FOR" => "1.1.1.1,2.2.2.2",
+          "REMOTE_ADDR" => "127.0.0.1",
+        }
+        @resp = @req.get("http://test.com/", env)
+      end
+      it 'sets ip' do
+        @env["REMOTE_ADDR"].should eq '2.2.2.2'
+      end
+      it 'sets proxy ip' do
+        @env["x.proxies"].should eq '127.0.0.1'
+      end
+      it 'keeps http' do
+        @env["rack.url_scheme"].should eq 'http'
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: x-real-ip
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - 55ideas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rpatricia
@@ -113,6 +113,7 @@ files:
 - lib/x-real-ip/railtie.rb
 - lib/x-real-ip/version.rb
 - spec/spec_helper.rb
+- spec/x_forwarded_for_spec.rb
 - spec/x_real_ip_spec.rb
 - x-real-ip.gemspec
 homepage: https://github.com/55ideas/x-real-ip
@@ -141,4 +142,5 @@ specification_version: 4
 summary: Replace REMOTE_IP with X-Real-Ip if it's trusted (useful for Nginx)
 test_files:
 - spec/spec_helper.rb
+- spec/x_forwarded_for_spec.rb
 - spec/x_real_ip_spec.rb