Merge pull request #128 from KJTsanaktsidis/ktsanaktsidis/fix_webrick…

…_cgi_test Fix WEBrick::TestFileHandler#test_short_filename test not working on mswin
ruby · Dec 27, 2023 · 1d156e3 · 1d156e3
2 parents 15e5ca9 + 3704b62
commit 1d156e3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 34 deletions.
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
@@ -12,30 +12,8 @@ def teardown
     super
   end
 
-  def start_cgi_server(log_tester=TestWEBrick::DefaultLogTester, &block)
-    config = {
-      :CGIInterpreter => TestWEBrick::RubyBin,
-      :DocumentRoot => File.dirname(__FILE__),
-      :DirectoryIndex => ["webrick.cgi"],
-      :RequestCallback => Proc.new{|req, res|
-        def req.meta_vars
-          meta = super
-          meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
-          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
-          return meta
-        end
-      },
-    }
-    if RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/
-      config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir.
-    end
-    TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
-      block.call(server, addr, port, log)
-    }
-  end
-
   def test_cgi
-    start_cgi_server{|server, addr, port, log|
+    TestWEBrick.start_cgi_server{|server, addr, port, log|
       http = Net::HTTP.new(addr, port)
       req = Net::HTTP::Get.new("/webrick.cgi")
       http.request(req){|res| assert_equal("/webrick.cgi", res.body, log.call)}
@@ -98,7 +76,7 @@ def test_bad_request
     log_tester = lambda {|log, access_log|
       assert_match(/BadRequest/, log.join)
     }
-    start_cgi_server(log_tester) {|server, addr, port, log|
+    TestWEBrick.start_cgi_server({}, log_tester) {|server, addr, port, log|
       sock = TCPSocket.new(addr, port)
       begin
         sock << "POST /webrick.cgi HTTP/1.0" << CRLF
@@ -115,7 +93,7 @@ def test_bad_request
   end
 
   def test_cgi_env
-    start_cgi_server do |server, addr, port, log|
+    TestWEBrick.start_cgi_server do |server, addr, port, log|
       http = Net::HTTP.new(addr, port)
       req = Net::HTTP::Get.new("/webrick.cgi/dumpenv")
       req['proxy'] = 'http://example.com/'
@@ -137,7 +115,7 @@ def test_bad_uri
       assert_equal(1, log.length)
       assert_match(/ERROR bad URI/, log[0])
     }
-    start_cgi_server(log_tester) {|server, addr, port, log|
+    TestWEBrick.start_cgi_server({}, log_tester) {|server, addr, port, log|
       res = TCPSocket.open(addr, port) {|sock|
         sock << "GET /#{CtrlSeq}#{CRLF}#{CRLF}"
         sock.close_write
@@ -155,7 +133,7 @@ def test_bad_header
       assert_equal(1, log.length)
       assert_match(/ERROR bad header/, log[0])
     }
-    start_cgi_server(log_tester) {|server, addr, port, log|
+    TestWEBrick.start_cgi_server({}, log_tester) {|server, addr, port, log|
       res = TCPSocket.open(addr, port) {|sock|
         sock << "GET / HTTP/1.0#{CRLF}#{CtrlSeq}#{CRLF}#{CRLF}"
         sock.close_write

diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
@@ -248,20 +248,15 @@ def test_unwise_in_path
   def test_short_filename
     return if File.executable?(__FILE__) # skip on strange file system
 
-    config = {
-      :CGIInterpreter => TestWEBrick::RubyBin,
-      :DocumentRoot => File.dirname(__FILE__),
-      :CGIPathEnv => ENV['PATH'],
-    }
     log_tester = lambda {|log, access_log|
       log = log.reject {|s| /ERROR `.*\' not found\./ =~ s }
       log = log.reject {|s| /WARN  the request refers nondisclosure name/ =~ s }
       assert_equal([], log)
     }
-    TestWEBrick.start_httpserver(config, log_tester) do |server, addr, port, log|
+    TestWEBrick.start_cgi_server({}, log_tester) do |server, addr, port, log|
       http = Net::HTTP.new(addr, port)
       if windows?
-        root = config[:DocumentRoot].tr("/", "\\")
+        root = File.dirname(__FILE__).tr("/", "\\")
         fname = IO.popen(%W[dir /x #{root}\\webrick_long_filename.cgi], encoding: "binary", &:read)
         fname.sub!(/\A.*$^$.*$^$/m, '')
         if fname

diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
@@ -81,4 +81,24 @@ def start_httpserver(config={}, log_tester=DefaultLogTester, &block)
   def start_httpproxy(config={}, log_tester=DefaultLogTester, &block)
     start_server(WEBrick::HTTPProxyServer, config, log_tester, &block)
   end
+
+  def start_cgi_server(config={}, log_tester=TestWEBrick::DefaultLogTester, &block)
+    config = {
+      :CGIInterpreter => TestWEBrick::RubyBin,
+      :DocumentRoot => File.dirname(__FILE__),
+      :DirectoryIndex => ["webrick.cgi"],
+      :RequestCallback => Proc.new{|req, res|
+        def req.meta_vars
+          meta = super
+          meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
+          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
+          return meta
+        end
+      },
+    }.merge(config)
+    if RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/
+      config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir.
+    end
+    start_server(WEBrick::HTTPServer, config, log_tester, &block)
+  end
 end