sbsm 1.5.9 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f2ae1755e50072d0307ecbe9c57c67c1b4a891a
-  data.tar.gz: 1b2e7d58d1b60cc487248e1123a8422cf051fd4a
+SHA256:
+  metadata.gz: 5c49aade69c54b5d99fabe38bb3896307a2a5d726629bbb14764c4bcbcee46ce
+  data.tar.gz: 76a61fc0932cfd6dd8bfb065e573c0c0b8b62b079235008620f82b2e76f7b4ac
 SHA512:
-  metadata.gz: 1e092d40cc433c228137788cbc01e79a2e31cb03d3c84ae51d6ad0c3c686241aead506e2baeabe841c58dc0b226616ab444324961e7607ab8e5034eb66157924
-  data.tar.gz: a430f249b35eed0d1b7514f352a8b4dfe27cd7f1d60efec3d4ca856884eb8756f7e28b81184b392707247f156923431d9b9a6d671935b60453cef4cba4591383
+  metadata.gz: 547e0cb68e3454ba50f7a2058fef10c482fdd1cee0454cb3ef6c00e5150718241f6d312464dd88ab1ea6738f1532f2cffc661ef65b2ab8f3c9aabb665c2fe460
+  data.tar.gz: 73c7c87eff58a13e476d0222d56b54ee57904e8b7757fe94cc4ca5fc0097828c3c2b88b6ce783cd5163a1886fc09701b83e457d3fe5bd56eaf7619b0b0214be0

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+# Using a matrix fails, because /setup-ruby always invokes bundle install without any additional args
+# Fixed by adding not defining the debugger group in the Gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu]
+        ruby: [2.5, 2.6, 2.7, 3.0, 3.1, head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Run tests via rake
+      run: bundle exec rake

data/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
+gem 'net-smtp', require: false
 
 gemspec

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.6.1 / 09.12.2022
+
+* Fix Mime-Bug for Davaz.com
+
+=== 1.6.0 / 13.06.2020
+
+* Remove calls to obsolete taint/untaint methods
+
 === 1.5.9 / 30.08.2017
 
 * Fix recognition whether we are using HTTPS or not

data/lib/sbsm/app.rb

@@ -93,6 +93,14 @@ module SBSM
       @@last_session
     end
 
+    def fix_html_content_type(content_type)
+      # davaz.com#50
+      if content_type == 'application/xhtml+xml'
+        return 'text/html; charset=utf-8'
+      end
+      return content_type
+    end
+
     def call(env) ## mimick sbsm/lib/app.rb
       request = Rack::Request.new(env)
       response = Rack::Response.new
@@ -106,7 +114,6 @@ module SBSM
       else
         file_name = File.expand_path(File.join('doc', request.path))
       end
-
       if File.file?(file_name)
         if File.extname(file_name).length > 0 && (mime_info = MimeMagic.by_extension(File.extname(file_name)))
           mime_type = mime_info.type
@@ -114,10 +121,11 @@ module SBSM
           mime_type = MimeMagic.by_path(file_name)
         end
         mime_type ||= 'text/plain'
+        mime_type = fix_html_content_type(mime_type)
         SBSM.debug "file_name is #{file_name} checkin base #{File.basename(file_name)} MIME #{mime_type}"
         response.set_header('Content-Type', mime_type)
         response.write(File.open(file_name, File::RDONLY){|file| file.read})
-        return response
+        return response.finish
       end
 
       return [400, {}, []] if /favicon.ico/i.match(request.path)
@@ -128,9 +136,9 @@ module SBSM
       thru = session.get_passthru
       if thru.size > 0
         begin
-          file_name = thru.first.untaint
+          file_name = thru.first
           raise Errno::ENOENT unless File.exist?(file_name)
-          response.set_header('Content-Type', MimeMagic.by_extension(File.extname(file_name)).type)
+          response.set_header('Content-Type', fix_html_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})

data/lib/sbsm/session.rb

@@ -479,7 +479,7 @@ module SBSM
     end
 		def passthru(path, disposition='attachment')
       # the variable @passthru is set by a trusted source
-      @passthru    = path.untaint
+      @passthru    = path
       @disposition = disposition
       ''
 		end

data/lib/sbsm/trans_handler.rb

@@ -44,13 +44,13 @@ module SBSM
     def initialize(name: nil, config_file: nil, handler_uri: nil)
       @handler_uri = handler_uri ||=  '/index.rbx'
       config_file ||=  'etc/trans_handler.yml'
-      @config_file = File.expand_path(config_file).untaint
+      @config_file = File.expand_path(config_file)
       @parser_name = name ||= 'uri'
       @parser_method = "_#{name}_parser"
       @grammar_path = File.expand_path("../../data/#{name}.grammar",
-        File.dirname(__FILE__).untaint)
+        File.dirname(__FILE__))
       @parser_path = File.expand_path("#{name}_parser.rb",
-        File.dirname(__FILE__).untaint)
+        File.dirname(__FILE__))
     end
     def config(request)
       config = Hash.new { {} }
@@ -150,12 +150,12 @@ module SBSM
 		end
 		def uri_parser(grammar_path=@grammar_path, parser_path=@parser_path)
 			if(File.exist?(grammar_path))
-				oldpath = File.expand_path("_" << File.basename(grammar_path), 
+				oldpath = File.expand_path("_" << File.basename(grammar_path),
 					File.dirname(grammar_path))
 				src = File.read(grammar_path)
-				unless(File.exists?(oldpath) && File.read(oldpath)==src)
-					File.delete(oldpath) if File.exists?(oldpath)
-					Parse.generate_parser_from_file_to_file(grammar_path, 
+				unless(File.exist?(oldpath) && File.read(oldpath)==src)
+					File.delete(oldpath) if File.exist?(oldpath)
+					Parse.generate_parser_from_file_to_file(grammar_path,
 						parser_path, @parser_method, 'SBSM')
 					File.open(oldpath, 'w') { |f| f << src }
 				end

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.5.9'
+  VERSION = '1.6.1'
 end

data/sbsm.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "flexmock"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "rdoc", '< 6.0.0'
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "watir"
   spec.add_development_dependency "watir-webdriver"

data/test/test_application.rb

@@ -54,7 +54,7 @@ class AppVariantTest < Minitest::Test
     head '/fr/page/about'
     assert last_response.ok?
     assert last_response.body.empty?
-    assert last_response.headers.keys.index('Content-Type')
+    assert last_response.headers.keys.index('content-type')
   end
   def test_request_file
     session_id_mock  = '1234'
@@ -72,8 +72,8 @@ class AppVariantTest < Minitest::Test
     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'])
+    assert last_response.headers.keys.index('content-type')
+    assert_equal('text/html', last_response.headers['content-type'])
   end
   def test_request_file_with_no_mime_info
     session_id_mock  = '1234'
@@ -92,8 +92,8 @@ class AppVariantTest < Minitest::Test
     result = get invalid_path, {},  env
 
     assert_equal(true, last_response.ok?)
-    assert last_response.headers.keys.index('Content-Type')
-    assert_equal('text/plain', last_response.headers['Content-Type'])
+    assert last_response.headers.keys.index('content-type')
+    assert_equal('text/plain', last_response.headers['content-type'])
     FileUtils.rm(file_name)
   end
   def test_request_file_with_mime_info
@@ -113,8 +113,8 @@ class AppVariantTest < Minitest::Test
     result = get invalid_path, {},  env
 
     assert_equal(true, last_response.ok?)
-    assert last_response.headers.keys.index('Content-Type')
-    assert_equal('image/png', last_response.headers['Content-Type'])
+    assert last_response.headers.keys.index('content-type')
+    assert_equal('image/png', last_response.headers['content-type'])
     FileUtils.rm(file_name)
   end
 end

data/test/test_customized_app.rb

@@ -72,12 +72,12 @@ module Demo
     PERSISTENT_COOKIE_NAME = 'CustomizedSession-cookie'
     LOOKANDFEEL            = CustomLookandfeel
 
-    def initialize(args)
+    def initialize(*args, **keyword_args)
       SBSM.debug "session args #{args}"
       @@active_stated_visited = false
       @@login_visited = false
       @@visited_init = true
-      super(args)
+      super(*args, **keyword_args)
     end
 
     def flavor
@@ -231,7 +231,7 @@ class CustomizedAppSessionValidatorLnf < Minitest::Test
     end
     assert last_response.ok?
     # TEST_COOKIE_NAME set via param to app
-    cookie = last_response.get_header('Set-Cookie').split("\n").find_all{|x| x.index(my_cookey_name)}
+    cookie = last_response.get_header('Set-Cookie')[0].split("\n").find_all{|x| x.index(my_cookey_name)}
     skip ('TODO: We should test test_customized_cookie_name')
     assert_equal 1, cookie.size
     assert_match my_cookey_name, cookie.first
@@ -249,7 +249,7 @@ class CustomizedAppCookieName < Minitest::Test
     get '/' do
     end
     assert last_response.ok?
-    cookie = last_response.get_header('Set-Cookie').split("\n").find_all{|x| x.index(Demo::DEMO_PERSISTENT_COOKIE_NAME)}
+    cookie = last_response.get_header('Set-Cookie')[0].split("\n").find_all{|x| x.index(Demo::DEMO_PERSISTENT_COOKIE_NAME)}
     skip ('TODO: We should test test_customized_cookie_name')
     assert_equal 1, cookie.size
     assert_match Demo::DEMO_PERSISTENT_COOKIE_NAME, cookie.first

data/test/test_rack_app.rb

@@ -115,10 +115,10 @@ class StubSessionWithView < SBSM::Session
 	attr_writer :lookandfeel, :persistent_user_input
 	attr_writer :active_state
 	public :active_state
-  def initialize(args)
-    args[:app]       ||= StubSessionApp.new
-    args[:validator] ||= StubSessionValidator.new
-    super(args)
+  def initialize(*args, **kwargs)
+    kwargs[:app]       ||= StubSessionApp.new
+    kwargs[:validator] ||= StubSessionValidator.new
+    super(*args, **kwargs)
     persistent_user_input = {}
   end
 end

data/test/test_trans_handler.rb

@@ -117,7 +117,7 @@ EOS
       request = fake_request_for_path  '/shortcut'
         # run in safe-mode
         Thread.new {
-          $SAFE = 1
+          # $SAFE = 1
           TransHandler.instance.translate_uri(request)
         }.join
       assert_equal({'shortcut' => 'variables'}, request.params)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.1
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2022-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -154,16 +154,16 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -254,8 +254,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENCE.txt
@@ -331,8 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Application framework for state based session management from ywesee

data/.travis.yml

@@ -1,27 +0,0 @@
----
-language: ruby
-
-notifications:
-  email:
-  - ngiger@ywesee.com
-
-cache: bundler
-
-sudo: false
-
-before_install:
-  - gem --version
-
-bundler_args: --without debugger
-
-rvm:
-  - ruby-head
-  - 2.2.3
-  - 2.4.0
-  - 2.3.0
-matrix:
-  allow_failures:
-    # On november 1 had failure compiling the child_processes
-    - rvm: ruby-head
-    - rvm: 2.2.3 # Test for LogLevel does not work
-    - rvm: 2.3.0 # Test for LogLevel does not work