webrick 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb619ce6c4c78dad51be27360158b7e70c92ebdaa17c7b67b238c43ede73637
-  data.tar.gz: a9a2262fe7d36731d0d251c800a59d9f266a49811da67d8fb8240339cc1fe884
+  metadata.gz: 32a11a2138bc27a617a7f69e300868cc4957cd208e5358d17aa5d3135c645c1c
+  data.tar.gz: 3be4ec01ad7ae153f32db3ab01133c7f7e308e7f6bf984aed5eb08a0646622bb
 SHA512:
-  metadata.gz: 051dbf7d8f19f366b7713835c2cc37c9f8c53c58c0a4d68fc8256d277c2379bc90099437a48fb876e8d3b6c414c417f5d8b9cf092f372a9dd715a7771c6764fb
-  data.tar.gz: 7541dc4794d62c5c6363ccc7da3742e9d61216e5f9a4a3d94418dc3239830320b416eeb464940ad75074802f673055141b7c4937983ede6d1092a888fc6f5df0
+  metadata.gz: d2eef98cfcc5a16f9da6b99e057ddbe5bb3bb00db407c259fc424092cdcefa94e3cec9dd82f71ab06fe9c423658ec0a4eb33a051f6bf9e3c034da19dc272449f
+  data.tar.gz: a0c44a9d8ca6e34666dd783941b908e7c7e496593f93b3f867cec75005b6727c3c7b276ee155e8eb2a886d2b90e47dbdf2ba42f97a1287addd34a76024502896

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rake"
+gem "test-unit"

data/README.md

@@ -1,7 +1,5 @@
 # Webrick
 
-[![Build Status](https://travis-ci.org/ruby/webrick.svg?branch=master)](https://travis-ci.org/ruby/webrick)
-
 WEBrick is an HTTP server toolkit that can be configured as an HTTPS server, a proxy server, and a virtual-host server.
 
 WEBrick features complete logging of both server operations and HTTP access.
@@ -56,7 +54,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and Patch are welcome on https://bugs.ruby-lang.org/.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ruby/webrick.
 
 ## License
 

data/Rakefile

@@ -2,9 +2,16 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test" << "test/lib"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/test_*.rb']
+  t.libs << "test/lib"
+  t.ruby_opts << "-rhelper"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
 end
 
 task :default => :test

data/lib/webrick/accesslog.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # accesslog.rb -- Access log handling utilities
 #

data/lib/webrick/cgi.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgi.rb -- Yet another CGI library
 #

data/lib/webrick/compat.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # compat.rb -- cross platform compatibility
 #

data/lib/webrick/config.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # config.rb -- Default configurations.
 #

data/lib/webrick/cookie.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cookie.rb -- Cookie class
 #
@@ -92,7 +92,7 @@ module WEBrick
     # The cookie string suitable for use in an HTTP header
 
     def to_s
-      ret = ""
+      ret = +""
       ret << @name << "=" << @value
       ret << "; " << "Version=" << @version.to_s if @version > 0
       ret << "; " << "Domain="  << @domain  if @domain

data/lib/webrick/htmlutils.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # htmlutils.rb -- HTMLUtils Module
 #

data/lib/webrick/httpauth/authenticator.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # httpauth/authenticator.rb -- Authenticator mix-in module.
 #
@@ -85,7 +85,7 @@ module WEBrick
       def log(meth, fmt, *args)
         msg = format("%s %s: ", @auth_scheme, @realm)
         msg << fmt % args
-        @logger.send(meth, msg)
+        @logger.__send__(meth, msg)
       end
 
       def error(fmt, *args)

data/lib/webrick/httpauth/basicauth.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpauth/basicauth.rb -- HTTP basic access authentication
 #

data/lib/webrick/httpauth/digestauth.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpauth/digestauth.rb -- HTTP digest access authentication
 #

data/lib/webrick/httpauth/htdigest.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpauth/htdigest.rb -- Apache compatible htdigest file
 #

data/lib/webrick/httpauth/htgroup.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpauth/htgroup.rb -- Apache compatible htgroup file
 #

data/lib/webrick/httpauth/htpasswd.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpauth/htpasswd -- Apache compatible htpasswd file
 #

data/lib/webrick/httpauth/userdb.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # httpauth/userdb.rb -- UserDB mix-in module.
 #

data/lib/webrick/httpauth.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpauth.rb -- HTTP access authentication
 #

data/lib/webrick/httpproxy.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpproxy.rb -- HTTPProxy Class
 #
@@ -115,7 +115,7 @@ module WEBrick
       proxy_auth(req, res)
 
       begin
-        self.send("do_#{req.request_method}", req, res)
+        public_send("do_#{req.request_method}", req, res)
       rescue NoMethodError
         raise HTTPStatus::MethodNotAllowed,
           "unsupported method `#{req.request_method}'."
@@ -295,6 +295,10 @@ module WEBrick
       return FakeProxyURI
     end
 
+    def create_net_http(uri, upstream)
+      Net::HTTP.new(uri.host, uri.port, upstream.host, upstream.port)
+    end
+
     def perform_proxy_request(req, res, req_class, body_stream = nil)
       uri = req.request_uri
       path = uri.path.dup
@@ -303,7 +307,7 @@ module WEBrick
       upstream = setup_upstream_proxy_authentication(req, res, header)
 
       body_tmp = []
-      http = Net::HTTP.new(uri.host, uri.port, upstream.host, upstream.port)
+      http = create_net_http(uri, upstream)
       req_fib = Fiber.new do
         http.start do
           if @config[:ProxyTimeout]

data/lib/webrick/httprequest.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httprequest.rb -- HTTPRequest Class
 #
@@ -9,6 +9,7 @@
 #
 # $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $
 
+require 'fiber'
 require 'uri'
 require_relative 'httpversion'
 require_relative 'httpstatus'
@@ -170,7 +171,7 @@ module WEBrick
       @accept_charset = []
       @accept_encoding = []
       @accept_language = []
-      @body = ""
+      @body = +""
 
       @addr = @peeraddr = nil
       @attributes = {}
@@ -273,13 +274,17 @@ module WEBrick
       self
     end
 
-    # for IO.copy_stream.  Note: we may return a larger string than +size+
-    # here; but IO.copy_stream does not care.
+    # for IO.copy_stream.
     def readpartial(size, buf = ''.b) # :nodoc
       res = @body_tmp.shift or raise EOFError, 'end of file reached'
+      if res.length > size
+        @body_tmp.unshift(res[size..-1])
+        res = res[0..size - 1]
+      end
       buf.replace(res)
       res.clear
-      @body_rd.resume # get more chunks
+      # get more chunks - check alive? because we can take a partial chunk
+      @body_rd.resume if @body_rd.alive?
       buf
     end
 
@@ -486,8 +491,7 @@ module WEBrick
       if @forwarded_host
         host, port = @forwarded_host, @forwarded_port
       elsif self["host"]
-        pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/n
-        host, port = *self['host'].scan(pattern)[0]
+        host, port = parse_host_request_line(self["host"])
       elsif @addr.size > 0
         host, port = @addr[2], @addr[1]
       else
@@ -499,6 +503,11 @@ module WEBrick
       return URI::parse(uri.to_s)
     end
 
+    def parse_host_request_line(host)
+      pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/no
+      host.scan(pattern)[0]
+    end
+
     def read_body(socket, block)
       return unless socket
       if tc = self['transfer-encoding']

data/lib/webrick/httpresponse.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpresponse.rb -- HTTPResponse Class
 #
@@ -105,6 +105,11 @@ module WEBrick
 
     attr_reader :sent_size
 
+    ##
+    # Set the response body proc as an streaming/upgrade response.
+
+    attr_accessor :upgrade
+
     ##
     # Creates a new HTTP response object.  WEBrick::Config::HTTP is the
     # default configuration.
@@ -217,6 +222,16 @@ module WEBrick
       @keep_alive
     end
 
+    ##
+    # Sets the response to be a streaming/upgrade response.
+    # This will disable keep-alive and chunked transfer encoding.
+
+    def upgrade!(protocol)
+      @upgrade = protocol
+      @keep_alive = false
+      @chunked = false
+    end
+
     ##
     # Sends the response on +socket+
 
@@ -242,6 +257,14 @@ module WEBrick
       @header['server'] ||= @config[:ServerSoftware]
       @header['date']   ||= Time.now.httpdate
 
+      if @upgrade
+        @header['connection'] = 'upgrade'
+        @header['upgrade'] = @upgrade
+        @keep_alive = false
+
+        return
+      end
+
       # HTTP/0.9 features
       if @request_http_version < "1.0"
         @http_version = HTTPVersion.new("0.9")
@@ -268,11 +291,10 @@ module WEBrick
       elsif %r{^multipart/byteranges} =~ @header['content-type']
         @header.delete('content-length')
       elsif @header['content-length'].nil?
-        if @body.respond_to? :readpartial
-        elsif @body.respond_to? :call
-          make_body_tempfile
+        if @body.respond_to?(:bytesize)
+          @header['content-length'] = @body.bytesize.to_s
         else
-          @header['content-length'] = (@body ? @body.bytesize : 0).to_s
+          @header['connection'] = 'close'
         end
       end
 
@@ -332,7 +354,7 @@ module WEBrick
 
     def send_header(socket) # :nodoc:
       if @http_version.major > 0
-        data = status_line()
+        data = status_line().dup
         @header.each{|key, value|
           tmp = key.gsub(/\bwww|^te$|\b\w/){ $&.upcase }
           data << "#{tmp}: #{check_header(value)}" << CRLF
@@ -419,7 +441,7 @@ module WEBrick
     # :stopdoc:
 
     def error_body(backtrace, ex, host, port)
-      @body = ''
+      @body = +''
       @body << <<-_end_of_html_
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <HTML>
@@ -453,11 +475,11 @@ module WEBrick
         if @request_method == "HEAD"
           # do nothing
         elsif chunked?
-          buf  = ''
+          buf = +''
           begin
             @body.readpartial(@buffer_size, buf)
             size = buf.bytesize
-            data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
+            data = +"#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
             socket.write(data)
             data.clear
             @sent_size += size
@@ -517,14 +539,16 @@ module WEBrick
         @body.call(ChunkedWrapper.new(socket, self))
         socket.write("0#{CRLF}#{CRLF}")
       else
-        size = @header['content-length'].to_i
         if @bodytempfile
           @bodytempfile.rewind
           IO.copy_stream(@bodytempfile, socket)
         else
           @body.call(socket)
         end
-        @sent_size = size
+
+        if content_length = @header['content-length']
+          @sent_size = content_length.to_i
+        end
       end
     end
 
@@ -539,7 +563,7 @@ module WEBrick
         socket = @socket
         @resp.instance_eval {
           size = buf.bytesize
-          data = "#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
+          data = +"#{size.to_s(16)}#{CRLF}#{buf}#{CRLF}"
           socket.write(data)
           data.clear
           @sent_size += size

data/lib/webrick/https.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # https.rb -- SSL/TLS enhancement for HTTPServer
 #

data/lib/webrick/httpserver.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpserver.rb -- HTTPServer Class
 #
@@ -285,7 +285,7 @@ module WEBrick
       end
 
       def normalize(dir)
-        ret = dir ? dir.dup : ""
+        ret = dir ? dir.dup : +""
         ret.sub!(%r|/+\z|, "")
         ret
       end

data/lib/webrick/httpservlet/abstract.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpservlet.rb -- HTTPServlet Module
 #

data/lib/webrick/httpservlet/cgi_runner.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgi_runner.rb -- CGI launcher.
 #
@@ -10,7 +10,7 @@
 # $IPR: cgi_runner.rb,v 1.9 2002/09/25 11:33:15 gotoyuzo Exp $
 
 def sysread(io, size)
-  buf = ""
+  buf = +""
   while size > 0
     tmp = io.sysread(size)
     buf << tmp

data/lib/webrick/httpservlet/cgihandler.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgihandler.rb -- CGIHandler Class
 #

data/lib/webrick/httpservlet/erbhandler.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # erbhandler.rb -- ERBHandler Class
 #

data/lib/webrick/httpservlet/filehandler.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # filehandler.rb -- FileHandler Module
 #
@@ -212,9 +212,18 @@ module WEBrick
 
       # :stopdoc:
 
+      def set_filesystem_encoding(str)
+        enc = Encoding.find('filesystem')
+        if enc == Encoding::US_ASCII
+          str.b
+        else
+          str.dup.force_encoding(enc)
+        end
+      end
+
       def service(req, res)
         # if this class is mounted on "/" and /~username is requested.
-        # we're going to override path informations before invoking service.
+        # we're going to override path information before invoking service.
         if defined?(Etc) && @options[:UserDir] && req.script_name.empty?
           if %r|^(/~([^/]+))| =~ req.path_info
             script_name, user = $1, $2
@@ -298,7 +307,7 @@ module WEBrick
       end
 
       def exec_handler(req, res)
-        raise HTTPStatus::NotFound, "`#{req.path}' not found" unless @root
+        raise HTTPStatus::NotFound, "`#{req.path}' not found." unless @root
         if set_filename(req, res)
           handler = get_handler(req, res)
           call_callback(:HandlerCallback, req, res)
@@ -324,11 +333,12 @@ module WEBrick
       end
 
       def set_filename(req, res)
-        res.filename = @root.dup
+        res.filename = @root
         path_info = req.path_info.scan(%r|/[^/]*|)
 
         path_info.unshift("")  # dummy for checking @root dir
         while base = path_info.first
+          base = set_filesystem_encoding(base)
           break if base == "/"
           break unless File.directory?(File.expand_path(res.filename + base))
           shift_path_info(req, res, path_info)
@@ -336,6 +346,7 @@ module WEBrick
         end
 
         if base = path_info.first
+          base = set_filesystem_encoding(base)
           if base == "/"
             if file = search_index_file(req, res)
               shift_path_info(req, res, path_info, file)
@@ -364,7 +375,7 @@ module WEBrick
 
       def shift_path_info(req, res, path_info, base=nil)
         tmp = path_info.shift
-        base = base || tmp
+        base = base || set_filesystem_encoding(tmp)
         req.path_info = path_info.join
         req.script_name << base
         res.filename = File.expand_path(res.filename + base)
@@ -470,9 +481,9 @@ module WEBrick
         elsif !namewidth or (namewidth = namewidth.to_i) < 2
           namewidth = 25
         end
-        query = query.inject('') {|s, (k, v)| s << '&' << HTMLUtils::escape("#{k}=#{v}")}
+        query = query.inject('') {|s, (k, v)| s << '&' << HTMLUtils::escape("#{k}=#{v}")}.dup
 
-        type = "text/html"
+        type = +"text/html"
         case enc = Encoding.find('filesystem')
         when Encoding::US_ASCII, Encoding::ASCII_8BIT
         else
@@ -481,7 +492,7 @@ module WEBrick
         res['content-type'] = type
 
         title = "Index of #{HTMLUtils::escape(req.path)}"
-        res.body = <<-_end_of_html_
+        res.body = +<<-_end_of_html_
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <HTML>
   <HEAD>
@@ -517,7 +528,7 @@ module WEBrick
           else
             dname = name
           end
-          s =  "<TR><TD class=\"name\"><A HREF=\"#{HTTPUtils::escape(name)}#{query if name.end_with?('/')}\">#{HTMLUtils::escape(dname)}</A></TD>"
+          s =  +"<TR><TD class=\"name\"><A HREF=\"#{HTTPUtils::escape(name)}#{query if name.end_with?('/')}\">#{HTMLUtils::escape(dname)}</A></TD>"
           s << "<TD class=\"mtime\">" << (time ? time.strftime("%Y/%m/%d %H:%M") : "") << "</TD>"
           s << "<TD class=\"size\">" << (size >= 0 ? size.to_s : "-") << "</TD></TR>\n"
           res.body << s

data/lib/webrick/httpservlet/prochandler.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # prochandler.rb -- ProcHandler Class
 #
@@ -40,6 +40,7 @@ module WEBrick
       end
 
       alias do_POST do_GET
+      alias do_PUT  do_GET
       # :startdoc:
     end
 

data/lib/webrick/httpservlet.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httpservlet.rb -- HTTPServlet Utility File
 #

data/lib/webrick/httpstatus.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # httpstatus.rb -- HTTPStatus Class
 #

data/lib/webrick/httputils.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # httputils.rb -- HTTPUtils Module
 #
@@ -48,6 +48,7 @@ module WEBrick
       "ai"    => "application/postscript",
       "asc"   => "text/plain",
       "avi"   => "video/x-msvideo",
+      "avif"  => "image/avif",
       "bin"   => "application/octet-stream",
       "bmp"   => "image/bmp",
       "class" => "application/octet-stream",
@@ -65,6 +66,7 @@ module WEBrick
       "gif"   => "image/gif",
       "htm"   => "text/html",
       "html"  => "text/html",
+      "ico"   => "image/x-icon",
       "jpe"   => "image/jpeg",
       "jpeg"  => "image/jpeg",
       "jpg"   => "image/jpeg",
@@ -72,10 +74,13 @@ module WEBrick
       "json"  => "application/json",
       "lha"   => "application/octet-stream",
       "lzh"   => "application/octet-stream",
+      "mjs"   => "application/javascript",
       "mov"   => "video/quicktime",
+      "mp4"   => "video/mp4",
       "mpe"   => "video/mpeg",
       "mpeg"  => "video/mpeg",
       "mpg"   => "video/mpeg",
+      "otf"   => "font/otf",
       "pbm"   => "image/x-portable-bitmap",
       "pdf"   => "application/pdf",
       "pgm"   => "image/x-portable-graymap",
@@ -94,8 +99,15 @@ module WEBrick
       "svg"   => "image/svg+xml",
       "tif"   => "image/tiff",
       "tiff"  => "image/tiff",
+      "ttc"   => "font/collection",
+      "ttf"   => "font/ttf",
       "txt"   => "text/plain",
       "wasm"  => "application/wasm",
+      "webm"  => "video/webm",
+      "webmanifest" => "application/manifest+json",
+      "webp"  => "image/webp",
+      "woff"  => "font/woff",
+      "woff2" => "font/woff2",
       "xbm"   => "image/x-xbitmap",
       "xhtml" => "text/html",
       "xls"   => "application/vnd.ms-excel",
@@ -111,7 +123,7 @@ module WEBrick
     def load_mime_types(file)
       # note: +file+ may be a "| command" for now; some people may
       # rely on this, but currently we do not use this method by default.
-      open(file){ |io|
+      File.open(file){ |io|
         hash = Hash.new
         io.each{ |line|
           next if /^#/ =~ line
@@ -230,7 +242,7 @@ module WEBrick
     # Quotes and escapes quotes in +str+
 
     def quote(str)
-      '"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
+      +'"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
     end
     module_function :quote
 
@@ -494,7 +506,7 @@ module WEBrick
     # Escapes path +str+
 
     def escape_path(str)
-      result = ""
+      result = +""
       str.scan(%r{/([^/]*)}).each{|i|
         result << "/" << _escape(i[0], UNESCAPED_PCHAR)
       }

data/lib/webrick/httpversion.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # HTTPVersion.rb -- presentation of HTTP version
 #

data/lib/webrick/log.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # log.rb -- Log Class
 #
@@ -86,15 +86,15 @@ module WEBrick
     end
 
     # Shortcut for logging a FATAL message
-    def fatal(msg) log(FATAL, "FATAL " << format(msg)); end
+    def fatal(msg) log(FATAL, "FATAL " + format(msg)); end
     # Shortcut for logging an ERROR message
-    def error(msg) log(ERROR, "ERROR " << format(msg)); end
+    def error(msg) log(ERROR, "ERROR " + format(msg)); end
     # Shortcut for logging a WARN message
-    def warn(msg)  log(WARN,  "WARN  " << format(msg)); end
+    def warn(msg)  log(WARN,  "WARN  " + format(msg)); end
     # Shortcut for logging an INFO message
-    def info(msg)  log(INFO,  "INFO  " << format(msg)); end
+    def info(msg)  log(INFO,  "INFO  " + format(msg)); end
     # Shortcut for logging a DEBUG message
-    def debug(msg) log(DEBUG, "DEBUG " << format(msg)); end
+    def debug(msg) log(DEBUG, "DEBUG " + format(msg)); end
 
     # Will the logger output FATAL messages?
     def fatal?; @level >= FATAL; end
@@ -118,7 +118,7 @@ module WEBrick
     # * Otherwise it will return +arg+.inspect.
     def format(arg)
       if arg.is_a?(Exception)
-        "#{arg.class}: #{AccessLog.escape(arg.message)}\n\t" <<
+        +"#{arg.class}: #{AccessLog.escape(arg.message)}\n\t" <<
         arg.backtrace.join("\n\t") << "\n"
       elsif arg.respond_to?(:to_str)
         AccessLog.escape(arg.to_str)

data/lib/webrick/server.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # server.rb -- GenericServer Class
 #
@@ -102,6 +102,9 @@ module WEBrick
       @listeners = []
       @shutdown_pipe = nil
       unless @config[:DoNotListen]
+        raise ArgumentError, "Port must be an integer" unless @config[:Port].to_s == @config[:Port].to_i.to_s
+
+        @config[:Port] = @config[:Port].to_i
         if @config[:Listen]
           warn(":Listen option is deprecated; use GenericServer#listen", uplevel: 1)
         end

data/lib/webrick/ssl.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # ssl.rb -- SSL/TLS enhancement for GenericServer
 #
@@ -95,18 +95,22 @@ module WEBrick
     # the issuer +cn+ and a +comment+ to be stored in the certificate.
 
     def create_self_signed_cert(bits, cn, comment)
-      rsa = OpenSSL::PKey::RSA.new(bits){|p, n|
-        case p
-        when 0; $stderr.putc "."  # BN_generate_prime
-        when 1; $stderr.putc "+"  # BN_generate_prime
-        when 2; $stderr.putc "*"  # searching good prime,
-                                  # n = #of try,
-                                  # but also data from BN_generate_prime
-        when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-                                  # but also data from BN_generate_prime
-        else;   $stderr.putc "*"  # BN_generate_prime
-        end
-      }
+      rsa = if $VERBOSE
+        OpenSSL::PKey::RSA.new(bits){|p, n|
+          case p
+          when 0; $stderr.putc "."  # BN_generate_prime
+          when 1; $stderr.putc "+"  # BN_generate_prime
+          when 2; $stderr.putc "*"  # searching good prime,
+                                    # n = #of try,
+                                    # but also data from BN_generate_prime
+          when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
+                                    # but also data from BN_generate_prime
+          else;   $stderr.putc "*"  # BN_generate_prime
+          end
+        }
+      else
+        OpenSSL::PKey::RSA.new(bits)
+      end
       cert = OpenSSL::X509::Certificate.new
       cert.version = 2
       cert.serial = 1
@@ -122,7 +126,7 @@ module WEBrick
       ef.issuer_certificate = cert
       cert.extensions = [
         ef.create_extension("basicConstraints","CA:FALSE"),
-        ef.create_extension("keyUsage", "keyEncipherment"),
+        ef.create_extension("keyUsage", "keyEncipherment, digitalSignature, keyAgreement, dataEncipherment"),
         ef.create_extension("subjectKeyIdentifier", "hash"),
         ef.create_extension("extendedKeyUsage", "serverAuth"),
         ef.create_extension("nsComment", comment),
@@ -130,7 +134,7 @@ module WEBrick
       aki = ef.create_extension("authorityKeyIdentifier",
                                 "keyid:always,issuer:always")
       cert.add_extension(aki)
-      cert.sign(rsa, OpenSSL::Digest::SHA256.new)
+      cert.sign(rsa, "SHA256")
 
       return [ cert, rsa ]
     end

data/lib/webrick/utils.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # utils.rb -- Miscellaneous utilities
 #
@@ -45,12 +45,7 @@ module WEBrick
     ##
     # The server hostname
     def getservername
-      host = Socket::gethostname
-      begin
-        Socket::gethostbyname(host)[0]
-      rescue
-        host
-      end
+      Socket::gethostname
     end
     module_function :getservername
 
@@ -83,7 +78,7 @@ module WEBrick
     # Generates a random string of length +len+
     def random_string(len)
       rand_max = RAND_CHARS.bytesize
-      ret = ""
+      ret = +""
       len.times{ ret << RAND_CHARS[rand(rand_max)] }
       ret
     end

data/lib/webrick/version.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # version.rb -- version and release date
 #
@@ -14,5 +14,5 @@ module WEBrick
   ##
   # The WEBrick version
 
-  VERSION      = "1.6.1"
+  VERSION      = "1.8.0"
 end

data/lib/webrick.rb

@@ -15,6 +15,11 @@
 # WEBrick also includes tools for daemonizing a process and starting a process
 # at a higher privilege level and dropping permissions.
 #
+# == Security
+#
+# *Warning:* WEBrick is not recommended for production.  It only implements
+# basic security checks.
+#
 # == Starting an HTTP server
 #
 # To create a new WEBrick::HTTPServer that will listen to connections on port
@@ -139,9 +144,9 @@
 # servers.  See WEBrick::HTTPAuth, WEBrick::HTTPAuth::BasicAuth and
 # WEBrick::HTTPAuth::DigestAuth.
 #
-# == WEBrick as a Production Web Server
+# == WEBrick as a daemonized Web Server
 #
-# WEBrick can be run as a production server for small loads.
+# WEBrick can be run as a daemonized server for small loads.
 #
 # === Daemonizing
 #

data/webrick.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.md",
     "Rakefile",
-    "bin/console",
-    "bin/setup",
     "lib/webrick.rb",
     "lib/webrick/accesslog.rb",
     "lib/webrick/cgi.rb",
@@ -57,20 +55,16 @@ Gem::Specification.new do |s|
     "lib/webrick/version.rb",
     "webrick.gemspec",
   ]
-  s.required_ruby_version = ">= 2.3.0"
+  s.required_ruby_version = ">= 2.4.0"
 
   s.authors = ["TAKAHASHI Masayoshi", "GOTOU YUUZOU", "Eric Wong"]
   s.email = [nil, nil, 'normal@ruby-lang.org']
-  s.homepage = "https://www.ruby-lang.org"
-  s.license = "BSD-2-Clause"
+  s.homepage = "https://github.com/ruby/webrick"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
 
   if s.respond_to?(:metadata=)
     s.metadata = {
-      "bug_tracker_uri" => "https://bugs.ruby-lang.org/projects/ruby-trunk/issues",
-      "homepage_uri" => "https://www.ruby-lang.org",
-      "source_code_uri" => "https://git.ruby-lang.org/ruby.git/"
+      "bug_tracker_uri" => "https://github.com/ruby/webrick/issues",
     }
   end
-
-  s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webrick
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - TAKAHASHI Masayoshi
@@ -10,22 +10,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2023-01-27 00:00:00.000000000 Z
+dependencies: []
 description: WEBrick is an HTTP server toolkit that can be configured as an HTTPS
   server, a proxy server, and a virtual-host server.
 email:
@@ -40,8 +26,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/webrick.rb
 - lib/webrick/accesslog.rb
 - lib/webrick/cgi.rb
@@ -78,13 +62,12 @@ files:
 - lib/webrick/utils.rb
 - lib/webrick/version.rb
 - webrick.gemspec
-homepage: https://www.ruby-lang.org
+homepage: https://github.com/ruby/webrick
 licenses:
+- Ruby
 - BSD-2-Clause
 metadata:
-  bug_tracker_uri: https://bugs.ruby-lang.org/projects/ruby-trunk/issues
-  homepage_uri: https://www.ruby-lang.org
-  source_code_uri: https://git.ruby-lang.org/ruby.git/
+  bug_tracker_uri: https://github.com/ruby/webrick/issues
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -93,14 +76,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: HTTP server toolkit

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "webrick"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here