* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):

  raise NotImplementedError if password is encrypted by digest
  algorithms. This patch is contributed by sheepman. [ruby-list:40467]

* lib/webrick/httpauth/digestauth.rb
  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
  This patch is contributed by sheepman. [ruby-list:40482]

* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
  pack/unpack-template char "m" instead of lib/base64.rb to do base64
  encoding/decoding. fixed: [ruby-dev:25336]

* test/webrick/test_httpauth.rb: new file.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 31 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index d45f4f1733..2f87556051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
+	  raise NotImplementedError if password is encrypted by digest
+	  algorithms. This patch is contributed by sheepman. [ruby-list:40467]
+
+	* lib/webrick/httpauth/digestauth.rb
+	  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
+	  This patch is contributed by sheepman. [ruby-list:40482]
+
+	* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
+	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
+	  encoding/decoding. fixed: [ruby-dev:25336]
+
+	* test/webrick/test_httpauth.rb: new file.
+
 Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
diff --git a/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb
index b78c40fd04..147c04021c 100644
--- a/lib/webrick/httpauth.rb
+++ b/lib/webrick/httpauth.rb
@@ -22,7 +22,7 @@ module WEBrick
       user = pass = nil
       if /^Basic\s+(.*)/o =~ req[req_field]
         userpass = $1
-        user, pass = decode64(userpass).split(":", 2)
+        user, pass = userpass.unpack("m*")[0].split(":", 2)
       end
       if block.call(user, pass)
         req.user = user
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb
index ca5b0e9da3..e835361dc2 100644
--- a/lib/webrick/httpauth/basicauth.rb
+++ b/lib/webrick/httpauth/basicauth.rb
@@ -34,7 +34,7 @@ module WEBrick
         unless basic_credentials = check_scheme(req)
           challenge(req, res)
         end
-        userid, password = decode64(basic_credentials).split(":", 2) 
+        userid, password = basic_credentials.unpack("m*")[0].split(":", 2) 
         password ||= ""
         if userid.empty?
           error("user id was not given.")
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb
index a5177459b7..318e0bf17f 100644
--- a/lib/webrick/httpauth/digestauth.rb
+++ b/lib/webrick/httpauth/digestauth.rb
@@ -174,11 +174,11 @@ module WEBrick
 
         if auth_req['qop'] == "auth" || auth_req['qop'] == nil
           ha2 = hexdigest(req.request_method, auth_req['uri'])
-          ha2_res = digest("", auth_req['uri'])
+          ha2_res = hexdigest("", auth_req['uri'])
         elsif auth_req['qop'] == "auth-int"
           ha2 = hexdigest(req.request_method, auth_req['uri'],
                           hexdigest(req.body))
-          ha2_res = digest("", auth_req['uri'], hexdigest(req.body))
+          ha2_res = hexdigest("", auth_req['uri'], hexdigest(res.body))
         end
 
         if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
@@ -330,10 +330,6 @@ module WEBrick
       def hexdigest(*args)
         @h.hexdigest(args.join(":"))
       end
-
-      def digest(*args)
-        @h.digest(args.join(":"))
-      end
     end
 
     class ProxyDigestAuth < DigestAuth
diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb
index a4a80647d8..40f9297b05 100644
--- a/lib/webrick/httpauth/htpasswd.rb
+++ b/lib/webrick/httpauth/htpasswd.rb
@@ -32,7 +32,15 @@ module WEBrick
           open(@path){|io|
             while line = io.gets
               line.chomp!
-              user, pass = line.split(":")
+              case line
+              when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
+                user, pass = line.split(":")
+              when /:\$/, /:\{SHA\}/
+                raise NotImplementedError,
+                      'MD5, SHA1 .htpasswd file not supported'
+              else
+                raise StandardError, 'bad .htpasswd file'
+              end
               @passwd[user] = pass
             end
           }
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index 65f830ecbb..c5ed44f1da 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -110,7 +110,7 @@ module WEBrick
         proxy_host = proxy.host
         proxy_port = proxy.port
         if proxy.userinfo
-          credentials = "Basic " + encode64(proxy.userinfo)
+          credentials = "Basic " + [proxy.userinfo].pack("m*")
           header['proxy-authorization'] = credentials
         end
       end
@@ -170,7 +170,7 @@ module WEBrick
       if proxy = proxy_uri(req, res)
         proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
         if proxy.userinfo
-          credentials = "Basic " + encode64(proxy.userinfo)
+          credentials = "Basic " + [proxy.userinfo].pack("m*")
         end
         host, port = proxy.host, proxy.port
       end