registrar 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a25b22e6152db7324fd77fe314456f0712b3307c
-  data.tar.gz: bdabcd14909f9a8c52a30281b348f26479bc5e39
+  metadata.gz: aea36c6ffc82208ace8e3d29c4f68bbdb256532f
+  data.tar.gz: 9a5ff1921848ac3abef563fcc4da7355a1c856de
 SHA512:
-  metadata.gz: 39cca0acf4f69843cc945e83a3414ccd6b5c4ca3a1834d4a3123ecceaa53c8a7d84ef289c586ed7bca6f9a7af41035c7960164eeebd7bc84833e2a6d5b374d02
-  data.tar.gz: be78150a414142ae34a14799f5a34e78f968294e2e48b49d484520b6f233b8e6b4ecdfd24ae1a9879fd1cc3a9c527c973613a9a2de25d076217f6303bc1416ff
+  metadata.gz: de3e2f7d3633a230a150f389fad514181f453f773648d1e738cf5cb4769a9715f6229a154ddf6d448942667a3d19d59badbdf9b4c4b9aa606cefe098c23d9409
+  data.tar.gz: ef54cf222736dd0e882a4014114653adb017a0cbdf2d22644b7dd876c3f850466ea110b0430396d2d7109928e716915303a4c89f2e1483159a32a54ed3d4f631

data/lib/registrar/auth_builder/omni_auth.rb

@@ -99,7 +99,14 @@ module Registrar
         end
 
         def ip
-          env['HTTP_CLIENT_IP'] || env['HTTP_X_REMOTE_ADDR'] || env['REMOTE_ADDR']
+          action_dispatch_remote_ip || env['HTTP_CLIENT_IP'] ||
+            env['HTTP_X_REMOTE_ADDR'] || env['REMOTE_ADDR']
+        end
+
+        def action_dispatch_remote_ip
+          if remote_ip = env['action_dispatch.remote_ip']
+            remote_ip.to_s
+          end
         end
 
         def user_agent

data/lib/registrar/version.rb

@@ -1,3 +1,3 @@
 module Registrar
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/spec/omni_auth_adapter_spec.rb

@@ -2,11 +2,45 @@ require 'spec_helper'
 require 'omniauth'
 
 class OmniAuthAuthBuilderSpec < Spec
+  let(:passed_env) { Hash.new }
+
   it 'normalizes OmniAuth Auth Hash Schema 1.0 and later' do
-    get '/'
+    passed_env['HTTP_USER_AGENT'] = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7"
+    passed_env['REMOTE_ADDR'] = "127.0.0.2"
+    passed_env['X-Locale'] = 'fr'
+
+    get '/', nil, passed_env
     assert_normalizes_auth env
   end
 
+  it 'prefers HTTP_X_REMOTE_ADDR over REMOTE_ADDR' do
+    passed_env['REMOTE_ADDR'] = '127.0.0.2'
+    passed_env['HTTP_X_REMOTE_ADDR'] = '127.0.0.3'
+
+    get '/', nil, passed_env
+
+    assert_equal passed_env['HTTP_X_REMOTE_ADDR'], traced['ip']
+  end
+
+  it 'prefers HTTP_CLIENT_IP over HTTP_X_REMOTE_ADDR' do
+    passed_env['HTTP_X_REMOTE_ADDR'] = '127.0.0.3'
+    passed_env['HTTP_CLIENT_IP'] = '127.0.0.4'
+
+    get '/', nil, passed_env
+
+    assert_equal passed_env['HTTP_CLIENT_IP'], traced['ip']
+  end
+
+  it 'prefers action_dispatch.remote_ip in env over HTTP_CLIENT_IP' do
+    remote_ip = RemoteIpFake.new("127.0.0.5")
+    passed_env['action_dispatch.remote_ip'] = remote_ip
+    passed_env['HTTP_CLIENT_IP'] = '127.0.0.4'
+
+    get '/', nil, passed_env
+
+    assert_equal "127.0.0.5", traced['ip']
+  end
+
   private
 
   def assert_normalizes_auth(env)
@@ -61,17 +95,8 @@ class OmniAuthAuthBuilderSpec < Spec
     builder.to_app
   end
 
-  class TraceStub
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      env['X-Locale'] = 'fr'
-      env['HTTP_USER_AGENT'] = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7"
-      env['REMOTE_ADDR'] = "127.0.0.2"
-      @app.call(env)
-    end
+  def traced
+    env['registrar.auth']['trace']
   end
 
   class TimeStub
@@ -80,18 +105,6 @@ class OmniAuthAuthBuilderSpec < Spec
     end
   end
 
-  def env
-    last_request.env
-  end
-
-  def response
-    last_response
-  end
-
-  def app
-    @app ||= build_app
-  end
-
   class OmniAuthFacebookStub
     def initialize(app)
       @app = app
@@ -121,9 +134,14 @@ class OmniAuthAuthBuilderSpec < Spec
     end
   end
 
+  class RemoteIpFake < Struct.new(:ip)
+    def to_s
+      ip
+    end
+  end
+
   def builder
     Rack::Builder.new do
-      use TraceStub
       use OmniAuthFacebookStub
 
       use Registrar::AuthBuilder::OmniAuth, TimeStub.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: registrar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Jan Owiesniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth