castle-rb 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef681fe4eea20aa8dacb69718809e49103e17060a5f2b0a57331982c9d36b59f
-  data.tar.gz: 6ab1e89bdefc563ce78ca7ae9666fb86f2b22ce0b740250a10f67fa3eaa1a98b
+  metadata.gz: 5d0999873fc06348f78e4663a5bf653fe64f62f8432af21a7596dca3ed935ee3
+  data.tar.gz: a3e523ef2862b8f2928c180d70242aac5afda8594f5d48f0fc2647186a107fb5
 SHA512:
-  metadata.gz: cbd67d2101f93caa9c3c793171759bdf0401313ff6c3dbccacc0843674a6ec36d8b0c63e1c705a54e7f27d0b10b59990b85131ad6f492f02ba1e8b2673679583
-  data.tar.gz: c56cbdb356049465687277a388d39c62fe41a90e8b02436c38568fd7d8e18e7f8fcd12ad37e5f87c6b6b2a0fce0651da1a2863d3f14034b90da41cc5a876cf6e
+  metadata.gz: 876a90d7bf0ceebefbd0ee2243f533cd520a91b8415fbbcb9b85eb2df5aa58dcc52717d267bb9edf89debd5a9e7f94f793b3564b34aaf6502a81885025ad6c08
+  data.tar.gz: 97f910519f2e67c9737219e4f7fe5c91f08bb817942bccc14dc534d67ec0a71db0d408d75454e4c67d148ca9aa60c30f3f9252a279321783d79ea07fd5cc43f6

data/lib/castle/configuration.rb

@@ -16,7 +16,9 @@ module Castle
       'Forwarded',
       'X-Forwarded',
       'X-Real-IP',
-      'REMOTE_ADDR'
+      'REMOTE_ADDR',
+      'X-Forwarded-For',
+      'CF_CONNECTING_IP'
     ].freeze
 
     BLACKLISTED = ['HTTP_COOKIE'].freeze

data/lib/castle/extractors/ip.rb

@@ -9,6 +9,8 @@ module Castle
       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
     end

data/lib/castle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Castle
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/spec/lib/castle/configuration_spec.rb

@@ -77,7 +77,7 @@ describe Castle::Configuration do
 
   describe 'whitelisted' do
     it do
-      expect(config.whitelisted.size).to be_eql(11)
+      expect(config.whitelisted.size).to be_eql(13)
     end
 
     context 'setter' do
@@ -94,7 +94,7 @@ describe Castle::Configuration do
         config.whitelisted += ['header']
       end
       it { expect(config.whitelisted).to be_include('Header') }
-      it { expect(config.whitelisted.size).to be_eql(12) }
+      it { expect(config.whitelisted.size).to be_eql(14) }
     end
   end
 

data/spec/lib/castle/extractors/ip_spec.rb

@@ -6,8 +6,22 @@ describe Castle::Extractors::IP do
   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) do
+        Rack::MockRequest.env_for(
+          '/',
+          'HTTP_CF_CONNECTING_IP' => '1.2.3.4',
+          'HTTP_X_FORWARDED_FOR' => '1.2.3.5'
+        )
+      end
+
+      it { expect(extractor.call).to eql('1.2.3.4') }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: castle-rb
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies: []
 description: Castle protects your users from account compromise
 email: johan@castle.io