diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-02 22:50:01 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-02 22:50:01 +0000 |
commit | 54980ce497ca577b817158137f199077daec7bb6 (patch) | |
tree | 744d380b07cf85d59237f126c66d984bde9223fd /lib/webrick/httpauth/digestauth.rb | |
parent | 47c4c9f830082b8c8272832ee8568c1a3bd3a3c2 (diff) |
* 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
Diffstat (limited to 'lib/webrick/httpauth/digestauth.rb')
-rw-r--r-- | lib/webrick/httpauth/digestauth.rb | 8 |
1 files changed, 2 insertions, 6 deletions
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 |