sbsm 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eda12c46b1116c92dfe97027a53565f71715cd3
-  data.tar.gz: 709c375fec68690bbabffebe91886f34f1b61503
+  metadata.gz: b2938a44d2cbad70bde08139096f8578c00cb635
+  data.tar.gz: ffef6523d8bcdae0ea1d9b1b553c704c1da2de66
 SHA512:
-  metadata.gz: 5086f2d5dc29a833ecc655695deac70c6373aa0363a5fc82ae9b7e9fe1dbaa9a121f700d36d5bb152a217cf6a949c6844114fb18cb7fe2fe0a3afc2f4221cf6d
-  data.tar.gz: 3be17e83ef6c00f6a1b192000848fdeae6d95ce294aa13ab28df53ba223208fcf073484b696ea5dca320d8697408b3ac14b1868db8bd0ea916206b8919c69771
+  metadata.gz: 22b3f3a5ef861c0737eb309f77820f722ca88076913c9b99ee9c409db66832f57c9d656b50aa5c0716d24b73de9fcfa8994052692523ff22d475fea1d6ef4c30
+  data.tar.gz: 3e7225581937bf52e25000c34525e58565d9d85c1514b610508784f607de82abdd065d933fb56ff92cdd4b27cb86310c3da712ecad9f300fb422976c16244381

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.6 / 12.07.2017
+
+* Handle several IPs in X_FORWARDED_FOR
+
 === 1.5.5 / 12.07.2017
 
 * Do not return body if HEAD is requested

data/lib/sbsm/app.rb

@@ -163,5 +163,9 @@ module SBSM
       response.finish
     end
 
+    private
+      def self.last_session  # for unit tests only
+        @@last_session
+      end
   end
 end

data/lib/sbsm/session.rb

@@ -518,6 +518,13 @@ module SBSM
 			@remote_ip ||= if(@request.respond_to?(:remote_host))
 				@request.remote_host
 			end
+      if @remote_ip.to_s.index(',')
+        saved = @remote_ip.clone
+        @remote_ip = @remote_ip.first if @remote_ip.is_a?(Array)
+        @remote_ip = @remote_ip.split(',').first.gsub(/[\[\]]/, '') if @remote_ip.is_a?(String)
+        SBSM.info("remote_ip is weird #{saved.inspect} => #{@remote_ip.inspect}")
+      end
+      @remote_ip
 		end
 		def set_cookie_input(key, val)
       SBSM.debug"set_cookie_input #{key} #{val}"

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.5.5'
+  VERSION = '1.5.6'
 end

data/test/test_session.rb

@@ -142,6 +142,23 @@ class StubSessionSession < SBSM::Session
 	end
 end
 
+class TestSessionApp < Minitest::Test
+  include Rack::Test::Methods
+  # attr_reader :app
+  def app
+    app = SBSM::RackInterface.new(app: SBSM::App)
+    builder = Rack::Builder.new
+    builder.run app
+  end
+  def test_request_remote_ip
+    get '/'
+    assert_nil SBSM::RackInterface.last_session.remote_ip
+    header 'X_FORWARDED_FOR', '[212.51.146.241],[66.249.93.27]' # a HTTP_ will be prepended to it
+    get '/'
+    assert_equal '212.51.146.241', SBSM::RackInterface.last_session.remote_ip
+  end
+end
+
 class TestSession < Minitest::Test
   include Rack::Test::Methods
 	def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz