ey_api_hmac 0.1.0 → 0.2.0

data/ey_api_hmac.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "ey_api_hmac"
   s.version     = EY::ApiHMAC::VERSION
   s.authors     = ["Jacob Burkhart & Thorben Schröder & David Calavera & others"]
-  s.email       = ["jacob@engineyard.com"]
+  s.email       = ["jacob@engineyard.com", "jlane@engineyard.com", "jrucker@engineyard.com"]
   s.homepage    = ""
   s.summary     = %q{HMAC Rack basic implementation for Engine Yard services}
   s.description = %q{basic wrapper for rack-client + middlewares for HMAC auth + helpers for SSO auth}

data/lib/ey_api_hmac.rb

@@ -19,7 +19,7 @@ module EY
         env[var]
       end
       parts << expect["REQUEST_METHOD"]
-      parts << expect["CONTENT_TYPE"]
+      parts << env["CONTENT_TYPE"]
       parts << generated_md5(env)
       parts << expect["HTTP_DATE"]
       if env["REQUEST_URI"]
@@ -77,7 +77,7 @@ module EY
       env["rack.input"].rewind
       request_body = env["rack.input"].read
       env["rack.input"].rewind
-      OpenSSL::Digest::MD5.hexdigest(request_body)
+      request_body.empty? ? nil : OpenSSL::Digest::MD5.hexdigest(request_body)
     end
 
   end

data/lib/ey_api_hmac/version.rb

@@ -1,5 +1,5 @@
 module EY
   module ApiHMAC
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/api_auth_spec.rb

@@ -4,6 +4,18 @@ require 'ey_api_hmac'
 require 'auth-hmac'
 require 'rack/contrib'
 require 'time'
+def compatible
+  it "verifies by ApiAuth" do
+    @lookup = Proc.new{ |key| 'secret' if key == 'access key 1' }
+    EY::ApiHMAC.authenticated?(@env, &@lookup).should be_true
+  end
+
+  it "verifies by AuthHMAC" do
+    @authhmac = AuthHMAC.new({"access key 1" => 'secret'})
+    @authhmac.authenticated?(@request).should be_true
+  end
+end
+
 
 describe EY::ApiHMAC::ApiAuth do
 
@@ -49,16 +61,15 @@ describe EY::ApiHMAC::ApiAuth do
         'PATH_INFO' => "/path/to/put",
         'QUERY_STRING' => 'foo=bar&bar=foo',
         'CONTENT_TYPE' => 'text/plain',
-        'HTTP_CONTENT_MD5' => 'd41d8cd98f00b204e9800998ecf8427e',
         'REQUEST_METHOD' => "PUT",
         'HTTP_DATE' => "Thu, 10 Jul 2008 03:29:56 GMT",
-        "rack.input" => StringIO.new}
+        "rack.input" => StringIO.new("somebody")}
       @request = Rack::Request.new(@env)
     end
 
     describe ".canonical_string" do
       it "should generate a canonical string using default method" do
-        expected = "PUT\ntext/plain\nd41d8cd98f00b204e9800998ecf8427e\nThu, 10 Jul 2008 03:29:56 GMT\n/path/to/put"
+        expected = "PUT\ntext/plain\n78b9d09661da64f0bc6c146c524bae4a\nThu, 10 Jul 2008 03:29:56 GMT\n/path/to/put"
         AuthHMAC.canonical_string(@request).should == expected
         EY::ApiHMAC.canonical_string(@env).should == expected
       end
@@ -66,7 +77,7 @@ describe EY::ApiHMAC::ApiAuth do
 
     describe ".signature" do
       it "should generate a valid signature string for a secret" do
-        expected = "isJ7zHHPrpnSdZ/XbvqxFhVUf0c="
+        expected = "EGLJlEoCa5s7MDgVZ7tGuIk3s68="
         AuthHMAC.signature(@request, 'secret').should == expected
         EY::ApiHMAC.signature(@env, 'secret').should == expected
       end
@@ -74,7 +85,7 @@ describe EY::ApiHMAC::ApiAuth do
 
     describe "sign!" do
       before do
-        @expected = "AuthHMAC my-key-id:isJ7zHHPrpnSdZ/XbvqxFhVUf0c="
+        @expected = "AuthHMAC my-key-id:EGLJlEoCa5s7MDgVZ7tGuIk3s68="
       end
 
       it "signs as expected with AuthHMAC" do
@@ -91,34 +102,55 @@ describe EY::ApiHMAC::ApiAuth do
 
     describe "authenticated?" do
       describe "request signed by AuthHMAC" do
-        before do
-          AuthHMAC.sign!(@request, 'access key 1', 'secret')
-          @env["HTTP_AUTHORIZATION"] = @request["Authorization"]
-        end
 
-        it "verifies by ApiAuth" do
-          @lookup = Proc.new{ |key| 'secret' if key == 'access key 1' }
-          EY::ApiHMAC.authenticated?(@env, &@lookup).should be_true
+        describe do
+          before do
+            AuthHMAC.sign!(@request, 'access key 1', 'secret')
+            @env["HTTP_AUTHORIZATION"] = @request["Authorization"]
+          end
+          compatible
         end
-
-        it "verifies by AuthHMAC" do
-          @authhmac = AuthHMAC.new({"access key 1" => 'secret'})
-          @authhmac.authenticated?(@request).should be_true
+        describe "without BODY" do
+          before do
+            @env['rack.input'] = StringIO.new
+            @env.delete('HTTP_CONTENT_MD5')
+            @request = Rack::Request.new(@env)
+            AuthHMAC.sign!(@request, 'access key 1', 'secret')
+            @env["HTTP_AUTHORIZATION"] = @request["Authorization"]
+          end
+          compatible
+        end
+        describe "without CONTENT_TYPE" do
+          before do
+            @env.delete('CONTENT_TYPE')
+            @request = Rack::Request.new(@env)
+            AuthHMAC.sign!(@request, 'access key 1', 'secret')
+            @env["HTTP_AUTHORIZATION"] = @request["Authorization"]
+          end
+          compatible
         end
       end
       describe "request signed by ApiAuth" do
-        before do
-          EY::ApiHMAC.sign!(@env, 'access key 1', 'secret')
+        describe "without content" do
+          before do
+            @env['rack.input'] = StringIO.new
+            @env.delete('HTTP_CONTENT_MD5')
+            EY::ApiHMAC.sign!(@env, 'access key 1', 'secret')
+          end
+          compatible
         end
-
-        it "verifies by ApiAuth" do
-          @lookup = Proc.new{ |key| 'secret' if key == 'access key 1' }
-          EY::ApiHMAC.authenticated?(@env, &@lookup).should be_true
+        describe "without CONTENT_TYPE" do
+          before do
+            @env.delete('CONTENT_TYPE')
+            EY::ApiHMAC.sign!(@env, 'access key 1', 'secret')
+          end
+          compatible
         end
-
-        it "verifies by AuthHMAC" do
-          @authhmac = AuthHMAC.new({"access key 1" => 'secret'})
-          @authhmac.authenticated?(@request).should be_true
+        describe do
+          before do
+            EY::ApiHMAC.sign!(@env, 'access key 1', 'secret')
+          end
+          compatible
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey_api_hmac
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-client
-  requirement: &70244892160460 !ruby/object:Gem::Requirement
+  requirement: &2158291480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244892160460
+  version_requirements: *2158291480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70244892146140 !ruby/object:Gem::Requirement
+  requirement: &2158290940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244892146140
+  version_requirements: *2158290940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244892148700 !ruby/object:Gem::Requirement
+  requirement: &2158290360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,11 +43,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244892148700
+  version_requirements: *2158290360
 description: basic wrapper for rack-client + middlewares for HMAC auth + helpers for
   SSO auth
 email:
 - jacob@engineyard.com
+- jlane@engineyard.com
+- jrucker@engineyard.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -87,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ey_api_hmac
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: HMAC Rack basic implementation for Engine Yard services