Fix bugs and improve (#152)

* Remove unused @form_data

* Change addr and peeraddr to non-nil

* Fix typo of constant name

* Improve split arguments

Author: znz

lib/webrick/httpauth/authenticator.rb

@@ -108,10 +108,10 @@ def info(fmt, *args)
     # authentication schemes for proxies.
 
     module ProxyAuthenticator
-      RequestField  = "Proxy-Authorization" # :nodoc:
-      ResponseField = "Proxy-Authenticate" # :nodoc:
-      InfoField     = "Proxy-Authentication-Info" # :nodoc:
-      AuthException = HTTPStatus::ProxyAuthenticationRequired # :nodoc:
+      RequestField      = "Proxy-Authorization" # :nodoc:
+      ResponseField     = "Proxy-Authenticate" # :nodoc:
+      ResponseInfoField = "Proxy-Authentication-Info" # :nodoc:
+      AuthException     = HTTPStatus::ProxyAuthenticationRequired # :nodoc:
     end
   end
 end

lib/webrick/httpauth/htgroup.rb

@@ -49,7 +49,7 @@ def reload
           File.open(@path){|io|
             while line = io.gets
               line.chomp!
-              group, members = line.split(/:\s*/)
+              group, members = line.split(/:\s*/, 2)
               @group[group] = members.split(/\s+/)
             end
           }

lib/webrick/httpauth/htpasswd.rb

@@ -77,12 +77,12 @@ def reload
                 if @password_hash == :bcrypt
                   raise StandardError, ".htpasswd file contains crypt password, only bcrypt passwords supported"
                 end
-                user, pass = line.split(":")
+                user, pass = line.split(":", 2)
               when %r!\A[^:]+:\$2[aby]\$\d{2}\$.{53}\z!
                 if @password_hash == :crypt
                   raise StandardError, ".htpasswd file contains bcrypt password, only crypt passwords supported"
                 end
-                user, pass = line.split(":")
+                user, pass = line.split(":", 2)
               when /:\$/, /:{SHA}/
                 raise NotImplementedError,
                       'MD5, SHA1 .htpasswd file not supported'

lib/webrick/httprequest.rb

@@ -162,7 +162,6 @@ def initialize(config)
       @script_name = @path_info = nil
       @query_string = nil
       @query = nil
-      @form_data = nil
 
       @raw_header = Array.new
       @header = nil
@@ -173,7 +172,8 @@ def initialize(config)
       @accept_language = []
       @body = +""
 
-      @addr = @peeraddr = nil
+      @addr = []
+      @peeraddr = []
       @attributes = {}
       @user = nil
       @keep_alive = false

sig/httpauth/authenticator.rbs

@@ -47,7 +47,7 @@ module WEBrick
 
       ResponseField: String
 
-      InfoField: String
+      ResponseInfoField: String
 
       AuthException: singleton(HTTPStatus::ClientError)
     end

sig/httprequest.rbs

@@ -8,8 +8,6 @@ module WEBrick
 
     @query: Hash[String, HTTPUtils::FormData]?
 
-    @form_data: nil
-
     @body: String
 
     @remaining_size: Integer?
@@ -72,9 +70,9 @@ module WEBrick
 
     attr_accessor user: String?
 
-    attr_reader addr: ([String, Integer, String, String] | [])?
+    attr_reader addr: ([String, Integer, String, String] | [])
 
-    attr_reader peeraddr: ([String, Integer, String, String] | [])?
+    attr_reader peeraddr: ([String, Integer, String, String] | [])
 
     attr_reader attributes: Hash[untyped, untyped]