net-http-digest_auth 1.2 → 1.2.1

data.tar.gz.sig

@@ -1,4 +1 @@
-E��$"�y,�N�gZ��坲����9��r�w#2ɰG�>$�V��M�I����,
-Ϸ�UЫDԉ�B�v\�j�c�9����1�|a
-��$`_��q���4�54��?i�cS8���.�ʘfǾE�j7r
-!W�p&�VPk���
+�{�)K�˶�[�k\�.n߰�h2���{Z�����oD��}� �i��܍=N|��M���Ǐ*�ۜIe�_a.�T]~J���Xi���t�Z���W����P��h�l�ᾕUw����Mg4�x�_����%�տ��ާNg���s�d}PU�������~�2�<�k��IS���ϧ��e�
ԫ)7ظ&eK��;`;�s�{�#�3�a=:b�7�n�V���+�2�+�9Fd~s�9)��k�":ay�E

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.1
+
+* Bug fix
+  * Fixed -sess authentication.  This also fixes pull request #4 by joe81
+
 === 1.2 / 2011-11-22
 
 * Minor enhancement

data/README.txt

@@ -1,23 +1,18 @@
 = net-http-digest_auth
 
-* http://github.com/drbrain/net-http-digest_auth
-* http://seattlerb.rubyforge.org/net-http-digest_auth
-* http://www.rfc-editor.org/rfc/rfc2617.txt
+code  :: http://github.com/drbrain/net-http-digest_auth
+rdoc  :: http://docs.seattlerb.org/net-http-digest_auth
+other :: http://www.rfc-editor.org/rfc/rfc2617.txt
 
 == DESCRIPTION:
 
 An implementation of RFC 2617 - Digest Access Authentication.  At this time
-the gem does not fully integrate with Net::HTTP and can be used for with other
-HTTP clients.
+the gem does not drop in to Net::HTTP and can be used for with other HTTP
+clients.
 
-== FEATURES/PROBLEMS:
-
-* Implements RFC 2617 for digest authentication
-* Does not fully integrate with Net::HTTP
-
-== SYNOPSIS:
-
-  See Net::HTTP::DigestAuth
+In order to use net-http-digest_auth you'll need to perform some request
+wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
+for an example.
 
 == INSTALL:
 
@@ -27,7 +22,7 @@ HTTP clients.
 
 (The MIT License)
 
-Copyright (c) 2010 Eric Hodel
+Copyright (c) Eric Hodel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -5,14 +5,11 @@ require 'hoe'
 
 Hoe.plugin :git
 Hoe.plugin :minitest
+Hoe.plugin :travis
 
 Hoe.spec 'net-http-digest_auth' do
-  self.rubyforge_name = 'seattlerb'
   developer 'Eric Hodel', 'drbrain@segment7.net'
 
-  spec_extras['homepage'] =
-    'http://docs.seattlerb.org/net-http-digest_auth'
-
   rdoc_locations <<
     'docs.seattlerb.org:/data/www/docs.seattlerb.org/net-http-digest_auth/'
   rdoc_locations <<

data/lib/net/http/digest_auth.rb

@@ -14,6 +14,8 @@ require 'monitor'
 #   require 'net/http'
 #   require 'net/http/digest_auth'
 #
+#   digest_auth = Net::HTTP::DigestAuth.new
+#
 #   uri = URI.parse 'http://localhost:8000/'
 #   uri.user = 'username'
 #   uri.password = 'password'
@@ -23,13 +25,15 @@ require 'monitor'
 #   req = Net::HTTP::Get.new uri.request_uri
 #
 #   res = h.request req
+#   # res is a 401 response with a WWW-Authenticate header
 #
-#   digest_auth = Net::HTTP::DigestAuth.new
 #   auth = digest_auth.auth_header uri, res['www-authenticate'], 'GET'
 #
+#   # create a new request with the Authorization header
 #   req = Net::HTTP::Get.new uri.request_uri
 #   req.add_field 'Authorization', auth
 #
+#   # re-issue request with Authorization
 #   res = h.request req
 
 class Net::HTTP::DigestAuth
@@ -44,7 +48,7 @@ class Net::HTTP::DigestAuth
   ##
   # Version of Net::HTTP::DigestAuth you are using
 
-  VERSION = '1.2'
+  VERSION = '1.2.1'
 
   ##
   # Creates a new DigestAuth header creator.
@@ -80,10 +84,14 @@ class Net::HTTP::DigestAuth
 
     www_authenticate =~ /^(\w+) (.*)/
 
+    challenge = $2
+
     params = {}
-    $2.gsub(/(\w+)="(.*?)"/) { params[$1] = $2 }
+    challenge.gsub(/(\w+)="(.*?)"/) { params[$1] = $2 }
 
-    qop = params['qop']
+    challenge =~ /algorithm=(.*?)([, ]|$)/
+
+    params['algorithm'] = $1 || 'MD5'
 
     if params['algorithm'] =~ /(.*?)(-sess)?$/
       algorithm = case $1
@@ -97,20 +105,19 @@ class Net::HTTP::DigestAuth
                   else raise Error, "unknown algorithm \"#{$1}\""
                   end
       sess = $2
-    else
-      algorithm = Digest::MD5
-      sess = false
     end
 
     a1 = if sess then
            [ algorithm.hexdigest("#{user}:#{params['realm']}:#{password}"),
              params['nonce'],
-             params['cnonce']
+             @cnonce,
            ].join ':'
          else
            "#{user}:#{params['realm']}:#{password}"
          end
 
+    qop = params['qop']
+
     ha1 = algorithm.hexdigest a1
     ha2 = algorithm.hexdigest "#{method}:#{uri.request_uri}"
 
@@ -122,6 +129,7 @@ class Net::HTTP::DigestAuth
     header = [
       "Digest username=\"#{user}\"",
       "realm=\"#{params['realm']}\"",
+      "algorithm=#{params['algorithm']}",
       if qop.nil? then
       elsif iis then
         "qop=\"#{qop}\""

data/sample/auth_server.rb

@@ -16,7 +16,6 @@ class AuthServlet < WEBrick::HTTPServlet::AbstractServlet
     config[:Realm] = 'net-http-digest_auth'
     config[:UseOpaque] = false
     config[:AutoReloadUserDB] = false
-    config[:Algorithm] = 'MD5'
 
     passwd_file = Tempfile.new 'net-http-digest_auth'
     passwd_file.close

data/test/test_net_http_digest_auth.rb

@@ -19,6 +19,7 @@ class TestNetHttpDigestAuth < MiniTest::Unit::TestCase
     @expected = [
       'Digest username="user"',
       'realm="www.example.com"',
+      'algorithm=MD5',
       'qop=auth',
       'uri="/"',
       'nonce="4107baa081a592a6021660200000cd6c5686ff5f579324402b374d83e2c9"',
@@ -37,14 +38,14 @@ class TestNetHttpDigestAuth < MiniTest::Unit::TestCase
   def test_auth_header
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
 
-    @expected[5] = 'nc=00000001'
-    @expected[7] = 'response="1f5f0cd1588690c1303737f081c0b9bb"'
+    @expected[6] = 'nc=00000001'
+    @expected[8] = 'response="1f5f0cd1588690c1303737f081c0b9bb"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
 
   def test_auth_header_iis
-    @expected[2] = 'qop="auth"'
+    @expected[3] = 'qop="auth"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET', true)
   end
@@ -52,8 +53,8 @@ class TestNetHttpDigestAuth < MiniTest::Unit::TestCase
   def test_auth_header_no_qop
     @header.sub! ' qop="auth",', ''
 
-    @expected[7] = 'response="32f6ca1631ccf7c42a8075deff44e470"'
-    @expected.slice! 2
+    @expected[8] = 'response="32f6ca1631ccf7c42a8075deff44e470"'
+    @expected.slice! 3
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
@@ -66,29 +67,31 @@ class TestNetHttpDigestAuth < MiniTest::Unit::TestCase
   end
 
   def test_auth_header_post
-    @expected[7] = 'response="d82219e1e5430b136bbae1670fa51d48"'
+    @expected[8] = 'response="d82219e1e5430b136bbae1670fa51d48"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'POST')
   end
 
   def test_auth_header_sess
-    @header << 'algorithm="MD5-sess"'
+    @header << ', algorithm=MD5-sess'
 
-    @expected[7] = 'response="76d3ff10007496cee26c61f9d04c72a8"'
+    @expected[2] = 'algorithm=MD5-sess'
+    @expected[8] = 'response="c22c5bd9112a86ca78ddc1ae772daeeb"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
 
   def test_auth_header_sha1
-    @expected[7] = 'response="2cb62fc18f7b0ebdc34543f896bb7768"'
+    @expected[2] = 'algorithm=SHA1'
+    @expected[8] = 'response="2cb62fc18f7b0ebdc34543f896bb7768"'
 
-    @header << 'algorithm="SHA1"'
+    @header << 'algorithm=SHA1'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
 
   def test_auth_header_unknown_algorithm
-    @header << 'algorithm="bogus"'
+    @header << 'algorithm=bogus'
 
     e = assert_raises Net::HTTP::DigestAuth::Error do
       @da.auth_header @uri, @header, 'GET'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-digest_auth
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  version: "1.2"
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -15,9 +16,9 @@ bindir: bin
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
   YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
+  ZXQwHhcNMTIwMjI4MTc1NDI1WhcNMTMwMjI3MTc1NDI1WjBBMRAwDgYDVQQDDAdk
   cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
   FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
   LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
@@ -25,17 +26,18 @@ cert_chain:
   Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
   mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
   g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
-  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
-  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
-  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
-  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
-  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
-  x52qPcexcYZR7w==
+  sCANiQ8BAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DAfBgNVHREEGDAWgRRkcmJyYWluQHNlZ21l
+  bnQ3Lm5ldDAfBgNVHRIEGDAWgRRkcmJyYWluQHNlZ21lbnQ3Lm5ldDANBgkqhkiG
+  9w0BAQUFAAOCAQEAPeWzFnrcvC6eVzdlhmjUub2s6qieBkongKRDHQz5MEeQv4LS
+  SARnoHY+uCAVL/1xGAhmpzqQ3fJGWK9eBacW/e8E5GF9xQcV3mE1bA0WNaiDlX5j
+  U2aI+ZGSblqvHUCxKBHR1s7UMHsbz1saOmgdRTyPx0juJs68ocbUTeYBLWu9V4KP
+  zdGAG2JXO2gONg3b4tYDvpBLbry+KOX27iAJulUaH9TiTOULL4ITJVFsK0mYVqmR
+  Q8Tno9S3e4XGGP1ZWfLrTWEJbavFfhGHut2iMRwfC7s/YILAHNATopaJdH9DNpd1
+  U81zGHMUBOvz/VGT6wJwYJ3emS2nfA2NOHFfgA==
   -----END CERTIFICATE-----
 
-date: 2011-11-23 00:00:00 Z
+date: 2012-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -45,32 +47,51 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 21
         segments: 
         - 2
-        - 6
-        version: "2.6"
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id003
 description: |-
   An implementation of RFC 2617 - Digest Access Authentication.  At this time
-  the gem does not fully integrate with Net::HTTP and can be used for with other
-  HTTP clients.
+  the gem does not drop in to Net::HTTP and can be used for with other HTTP
+  clients.
+  
+  In order to use net-http-digest_auth you'll need to perform some request
+  wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
+  for an example.
 email: 
 - drbrain@segment7.net
 executables: []
@@ -121,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: seattlerb
-rubygems_version: 1.8.10
+rubyforge_project: net-http-digest_auth
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An implementation of RFC 2617 - Digest Access Authentication

metadata.gz.sig

@@ -1,3 +1 @@
-i�7��'���j�;�J		����hfA�{�M��'�xh�x�^M	c+���Z_˗'�X�.����ї�
-{����/ojt[�2C���N����gg7�#�tȩ�O�_�V�f���y�K�Mn���Jt}_�.���i}/�Q㏿<
-���z���A75�c_���*���W��Ƀ�
�������DnʕD�Z_C�M�q�tՋ'3��X���]EV�7���
���ANk��r��v�c��!~1�xxP
+3�l��)�s0�{p���*6�j��e�f?�<4m9�WE��%(�7�[߽���Pj/�\��)��_�v�dTϳeeIY�I�&����t�Pek���U��T��hN�36���W�ے��zt�2�ߞL���I#��ÈA�mtY{dH����V�s��0��ŌN�IwfX�=PS�>�b�O\����S.2����?)������_�J���ˆ޺�%�zH4�6�T)��&�El}+��_�7�A�;��Q5G�N歷�����ߕ