sbsm 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2938a44d2cbad70bde08139096f8578c00cb635
-  data.tar.gz: ffef6523d8bcdae0ea1d9b1b553c704c1da2de66
+  metadata.gz: d5121512c837227a27ac5adae0dc1f1264a20829
+  data.tar.gz: 9088b0ec0826c8013ef29ac9e17befea18de4d4d
 SHA512:
-  metadata.gz: 22b3f3a5ef861c0737eb309f77820f722ca88076913c9b99ee9c409db66832f57c9d656b50aa5c0716d24b73de9fcfa8994052692523ff22d475fea1d6ef4c30
-  data.tar.gz: 3e7225581937bf52e25000c34525e58565d9d85c1514b610508784f607de82abdd065d933fb56ff92cdd4b27cb86310c3da712ecad9f300fb422976c16244381
+  metadata.gz: eda614acaf8ca9a2c2fb2678f613868dd7be9364db124182e6992bfb9d514b51f035eedb832147920d98f203740d7759775486147dd93d7062b1c9471a603b33
+  data.tar.gz: 492ff66f7b38b7f78eb66328056102706f0094b524724e515b84d6ddafdffa781b64d32e9eadb473eda03a852af055dc4151d78f59151ab95e1d18369627bc06

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.7 / 8.08.2017
+
+* Return nice 404 error for non existing files
+
 === 1.5.6 / 12.07.2017
 
 * Handle several IPs in X_FORWARDED_FOR

data/lib/sbsm/app.rb

@@ -127,15 +127,17 @@ module SBSM
       res = session.process_rack(rack_request: request)
       thru = session.get_passthru
       if thru.size > 0
-        file_name = thru.first.untaint
-        response.set_header('Content-Type', MimeMagic.by_extension(File.extname(file_name)).type)
-        response.headers['Content-Disposition'] = "#{thru.last}; filename=#{File.basename(file_name)}"
-        response.headers['Content-Length'] =  File.size(file_name).to_s
         begin
+          file_name = thru.first.untaint
+          raise Errno::ENOENT unless File.exist?(file_name)
+          response.set_header('Content-Type', MimeMagic.by_extension(File.extname(file_name)).type)
+          response.headers['Content-Disposition'] = "#{thru.last}; filename=#{File.basename(file_name)}"
+          response.headers['Content-Length'] =  File.size(file_name).to_s
           response.write(File.open(file_name, File::RDONLY){|file| file.read})
         rescue Errno::ENOENT, IOError => err
-          SBSM.error("#{err.message} #{thru.first}")
-          return [404, {}, []]
+          error_msg = "#{file_name} Not found\n"
+          SBSM.error("#{err.message} #{thru.first} => #{error_msg}")
+          return [404, {'Content-Type' => 'text/html', 'Content-Length' => error_msg.size.to_s}, [error_msg]]
         end
       else
         response.write res unless request.request_method.eql?('HEAD')

data/lib/sbsm/version.rb

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

data/test/test_application.rb

@@ -7,6 +7,7 @@ ENV['RACK_ENV'] = 'test'
 ENV['REQUEST_METHOD'] = 'GET'
 
 require 'minitest/autorun'
+require 'flexmock/minitest'
 require 'rack/test'
 require 'sbsm/app'
 require 'sbsm/session'
@@ -55,6 +56,25 @@ class AppVariantTest < Minitest::Test
     assert last_response.body.empty?
     assert last_response.headers.keys.index('Content-Type')
   end
+  def test_request_file
+    session_id_mock  = '1234'
+    invalid_path = '/path/to/non/existing/file'
+
+    @app = flexmock('file_app', @app)
+    env = { 'HTTP_COOKIE' => "_session_id=#{session_id_mock}" }
+    session_store = SBSM::SessionStore.new(app: @app)
+    session_mock= flexmock('session', session_store[session_id_mock.to_s])
+    session_mock.should_receive(:get_passthru).and_return([invalid_path])
+    @app.should_receive(:session_store).and_return(session_store)
+
+    result = get invalid_path, {},  env
+
+    assert_equal(false, last_response.ok?)
+    assert_equal(404, last_response.status)
+    assert (last_response.body.to_s.index(invalid_path))
+    assert last_response.headers.keys.index('Content-Type')
+    assert_equal('text/html', last_response.headers['Content-Type'])
+  end
 end
 
 class AppTestSimple < Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack