check CF header for ip

castle · Jan 22, 2018 · 39c4eae · 39c4eae
1 parent 7781f18
commit 39c4eae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 **Enhancements:**
 
-- [#100](github.com/castle/castle-ruby/pull/100) use request.remote_ip in favour of request.ip if present
+- [#100](github.com/castle/castle-ruby/pull/100) use request.remote_ip and CF connecting IP in favour of request.ip if present
 
 ## 3.3.0 (2018-01-12)
 

diff --git a/lib/castle/extractors/ip.rb b/lib/castle/extractors/ip.rb
@@ -9,6 +9,7 @@ def initialize(request)
       end
 
       def call
+        return @request.env['HTTP_CF_CONNECTING_IP'] if @request.env['HTTP_CF_CONNECTING_IP']
         return @request.remote_ip if @request.respond_to?(:remote_ip)
         @request.ip
       end

diff --git a/spec/lib/castle/extractors/ip_spec.rb b/spec/lib/castle/extractors/ip_spec.rb
@@ -6,8 +6,18 @@
   let(:request) { Rack::Request.new(env) }
 
   describe 'ip' do
-    let(:env) { Rack::MockRequest.env_for( '/', 'HTTP_X_FORWARDED_FOR' => '1.2.3.4') }
+    context 'when regular ip' do
+      let(:env) { Rack::MockRequest.env_for('/', 'HTTP_X_FORWARDED_FOR' => '1.2.3.5') }
 
-    it { expect(extractor.call).to eql('1.2.3.4') }
+      it { expect(extractor.call).to eql('1.2.3.5') }
+    end
+
+    context 'when cf remote_ip' do
+      let(:env) { Rack::MockRequest.env_for('/',
+                                            'HTTP_CF_CONNECTING_IP' => '1.2.3.4',
+                                            'HTTP_X_FORWARDED_FOR' => '1.2.3.5') }
+
+      it { expect(extractor.call).to eql('1.2.3.4') }
+    end
   end
 end