dnclabs-auth-hmac 1.1.1.2010090201 → 1.1.1.2011051301

data/lib/auth-hmac.rb

@@ -7,7 +7,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'openssl'
-require 'base64'
 
 # This module provides a HMAC Authentication method for HTTP requests. It should work with
 # net/http request classes and CGIRequest classes and hence Rails.
@@ -95,8 +94,15 @@ class AuthHMAC
       
       def header_values(request)
         headers = headers(request)
+        md5 = content_md5(headers)
+
+        if md5.nil? && ! request_body(request).blank?
+          md5 = generate_content_md5(request)
+          headers['Content-MD5'] = md5
+        end
+
         [ content_type(headers),
-          (content_md5(headers) or (request.body.blank? ? '' : headers['Content-MD5'] = generate_content_md5(request))),
+          md5,
           (date(headers) or headers['Date'] = Time.now.utc.httpdate)
         ].join("\n")
       end
@@ -114,7 +120,17 @@ class AuthHMAC
       end
 
       def generate_content_md5(request)
-        OpenSSL::Digest::MD5.hexdigest(request.body)
+        OpenSSL::Digest::MD5.hexdigest(request_body(request))
+      end
+
+      def request_body(request)
+        if request.body.respond_to? :read
+          body = request.body.read
+          request.body.rewind
+          body
+        else
+          body = request.body
+        end
       end
       
       def request_path(request, authenticate_referrer)
@@ -247,7 +263,7 @@ class AuthHMAC
 
   def signature(request, secret)
     digest = OpenSSL::Digest::Digest.new('sha1')
-    Base64.encode64(OpenSSL::HMAC.digest(digest, secret, canonical_string(request, @authenticate_referrer))).strip
+    [OpenSSL::HMAC.digest(digest, secret, canonical_string(request, @authenticate_referrer))].pack('m').strip
   end
 
   def canonical_string(request, authenticate_referrer=false)

data/spec/auth-hmac_spec.rb

@@ -286,10 +286,23 @@ describe AuthHMAC do
       AuthHMAC::CanonicalString.new(request).should match(/#{content_md5}/)
     end
 
+    it "should generate the content-md5 from a rack-compatible body object" do
+      body_str = "foo=bar&baz=qux"
+      request = Net::HTTP::Put.new("/")
+      request.body = mock("Body", :read => body_str, :rewind => nil, :to_str => body_str)
+      content_md5 = OpenSSL::Digest::MD5.hexdigest(request.body)
+      AuthHMAC::CanonicalString.new(request).should match(/#{content_md5}/)
+    end
+
     it "should not generate a content-md5 when there is no request body" do
       request = Net::HTTP::Get.new("/")
       AuthHMAC::CanonicalString.new(request).should match(/^GET\n\n\n/)
     end
+
+    it "should not generate a content-md5 when there is no request body on POST requests" do
+      request = Net::HTTP::Post.new("/")
+      AuthHMAC::CanonicalString.new(request).should match(/^POST\n\n\n/)
+    end
     
     it "should include the date" do
       date = Time.now.httpdate

metadata

@@ -1,20 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dnclabs-auth-hmac
 version: !ruby/object:Gem::Version 
-  hash: 4020180449
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  - 2010090201
-  version: 1.1.1.2010090201
+  prerelease: 
+  version: 1.1.1.2011051301
 platform: ruby
 authors: 
 - Sean Geoghegan
 - ascarter
 - Wes Morgan
 - Adrian Cushman
+- Dave Steinberg
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -23,37 +18,49 @@ date: 2010-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: 1.8.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
+        version: 2.3.8
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: A gem providing HMAC based authentication for HTTP. This is the DNC Labs fork.
 email: innovationlab@dnc.org
 executables: []
@@ -103,25 +110,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: ""
-rubygems_version: 1.3.7
+rubyforge_project: auth-hmac
+rubygems_version: 1.6.1
 signing_key: 
-specification_version: 3
-summary: A gem providing HMAC based authentication for HTTP. This is the DNC Labs fork.
+specification_version: 2
+summary: A gem providing HMAC based authentication for HTTP
 test_files: []