api-auth 1.0.3 → 1.1.0

data/Rakefile

@@ -10,13 +10,3 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "test #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/api_auth/base.rb

@@ -80,7 +80,7 @@ module ApiAuth
     def hmac_signature(request, secret_key)
       headers = Headers.new(request)
       canonical_string = headers.canonical_string
-      digest = OpenSSL::Digest::Digest.new('sha1')
+      digest = OpenSSL::Digest.new('sha1')
       b64_encode(OpenSSL::HMAC.digest(digest, secret_key, canonical_string))
     end
 

data/lib/api_auth/headers.rb

@@ -27,22 +27,24 @@ module ApiAuth
         @request = ActionDispatchRequest.new(request)
       when /Rack::Request/
         @request = RackRequest.new(request)
+      when /ActionController::CgiRequest/
+        @request = ActionControllerRequest.new(request)
       else
         raise UnknownHTTPRequest, "#{request.class.to_s} is not yet supported."
       end
       true
     end
-    
+
     # Returns the request timestamp
     def timestamp
-       @request.timestamp 
+       @request.timestamp
     end
 
     # Returns the canonical string computed from the request's headers
     def canonical_string
       [ @request.content_type,
         @request.content_md5,
-        @request.request_uri.gsub(/http:\/\/[^(,|\?|\/)]*/,''), # remove host
+        @request.request_uri.gsub(/https?:\/\/[^(,|\?|\/)]*/,''), # remove host
         @request.timestamp
       ].join(",")
     end
@@ -53,15 +55,15 @@ module ApiAuth
     end
 
     def set_date
-      @request.set_date if @request.timestamp.blank?
+      @request.set_date if @request.timestamp.empty?
     end
 
     def calculate_md5
-      @request.populate_content_md5 if @request.content_md5.blank?
+      @request.populate_content_md5 if @request.content_md5.empty?
     end
 
     def md5_mismatch?
-      if @request.content_md5.blank?
+      if @request.content_md5.empty?
         false
       else
         @request.md5_mismatch?

data/lib/api_auth/helpers.rb

@@ -2,9 +2,8 @@ module ApiAuth
 
   module Helpers # :nodoc:
     
-    # Remove the ending new line character added by default
     def b64_encode(string)
-      Base64.encode64(string).strip
+      Base64.strict_encode64(string)
     end
     
     # Capitalizes the keys of a hash

data/lib/api_auth/request_drivers/rack.rb

@@ -21,6 +21,7 @@ module ApiAuth
       def calculated_md5
         if @request.body
           body = @request.body.read
+          @request.body.rewind
         else
           body = ''
         end
@@ -51,7 +52,7 @@ module ApiAuth
       end
 
       def content_md5
-        value = find_header(%w(CONTENT-MD5 CONTENT_MD5))
+        value = find_header(%w(CONTENT-MD5 CONTENT_MD5 HTTP-CONTENT-MD5 HTTP_CONTENT_MD5))
         value.nil? ? "" : value
       end
 

data/lib/api_auth/request_drivers/rest_client.rb

@@ -25,6 +25,7 @@ module ApiAuth
       def calculated_md5
         if @request.payload
           body = @request.payload.read
+          @request.payload.instance_variable_get(:@stream).seek(0)
         else
           body = ''
         end
@@ -51,7 +52,7 @@ module ApiAuth
 
       def content_type
         value = find_header(%w(CONTENT-TYPE CONTENT_TYPE HTTP_CONTENT_TYPE))
-        value.nil? ? "" : value
+        value.nil? ? "": value
       end
 
       def content_md5
@@ -81,11 +82,11 @@ module ApiAuth
       def find_header(keys)
         keys.map {|key| @headers[key] }.compact.first
       end
-      
+
       def save_headers
         @request.processed_headers = @request.make_headers(@headers)
       end
-      
+
     end
 
   end

data/spec/api_auth_spec.rb

@@ -8,8 +8,8 @@ describe "ApiAuth" do
       ApiAuth.generate_secret_key
     end
 
-    it "should generate secret keys that are 89 characters" do
-      ApiAuth.generate_secret_key.size.should be(89)
+    it "should generate secret keys that are 88 characters" do
+      ApiAuth.generate_secret_key.size.should be(88)
     end
 
     it "should generate keys that have a Hamming Distance of at least 65" do
@@ -24,7 +24,7 @@ describe "ApiAuth" do
 
     def hmac(secret_key, request)
       canonical_string = ApiAuth::Headers.new(request).canonical_string
-      digest = OpenSSL::Digest::Digest.new('sha1')
+      digest = OpenSSL::Digest.new('sha1')
       ApiAuth.b64_encode(OpenSSL::HMAC.digest(digest, secret_key, canonical_string))
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -187,21 +187,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 579957539921083557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 579957539921083557
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple HMAC authentication for your APIs