From 54980ce497ca577b817158137f199077daec7bb6 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sun, 2 Jan 2005 22:50:01 +0000 Subject: * 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 --- lib/webrick/httpauth/digestauth.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/webrick/httpauth/digestauth.rb') 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 -- cgit v1.2.3