api-auth 2.2.1 → 2.5.0

data/spec/request_drivers/rest_client_spec.rb

@@ -8,7 +8,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
   let(:request_headers) do
     {
       'Authorization' => 'APIAuth 1044:12345',
-      'Content-MD5' => '1B2M2Y8AsgTpgAmY7PhCfg==',
+      'X-Authorization-Content-SHA256' => '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
       'Content-Type' => 'text/plain',
       'Date' => timestamp
     }
@@ -30,8 +30,8 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
       expect(driven_request.content_type).to eq('text/plain')
     end
 
-    it 'gets the content_md5' do
-      expect(driven_request.content_md5).to eq('1B2M2Y8AsgTpgAmY7PhCfg==')
+    it 'gets the content_hash' do
+      expect(driven_request.content_hash).to eq('47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=')
     end
 
     it 'gets the request_uri' do
@@ -46,9 +46,9 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
       expect(driven_request.authorization_header).to eq('APIAuth 1044:12345')
     end
 
-    describe '#calculated_md5' do
-      it 'calculates md5 from the body' do
-        expect(driven_request.calculated_md5).to eq('kZXQvrKoieG+Be1rsZVINw==')
+    describe '#calculated_hash' do
+      it 'calculates hash from the body' do
+        expect(driven_request.calculated_hash).to eq('JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=')
       end
 
       it 'treats no body as empty string' do
@@ -58,7 +58,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
           method: :put
         )
         driven_request = ApiAuth::RequestDrivers::RestClientRequest.new(request)
-        expect(driven_request.calculated_md5).to eq('1B2M2Y8AsgTpgAmY7PhCfg==')
+        expect(driven_request.calculated_hash).to eq('47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=')
       end
     end
 
@@ -100,7 +100,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
       }
     end
 
-    describe '#populate_content_md5' do
+    describe '#populate_content_hash' do
       context 'when getting' do
         let(:request) do
           RestClient::Request.new(
@@ -110,9 +110,9 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
           )
         end
 
-        it "doesn't populate content-md5" do
-          driven_request.populate_content_md5
-          expect(request.headers['Content-MD5']).to be_nil
+        it "doesn't populate content hash" do
+          driven_request.populate_content_hash
+          expect(request.headers['X-Authorization-Content-SHA256']).to be_nil
         end
       end
 
@@ -126,14 +126,14 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
           )
         end
 
-        it 'populates content-md5' do
-          driven_request.populate_content_md5
-          expect(request.headers['Content-MD5']).to eq('kZXQvrKoieG+Be1rsZVINw==')
+        it 'populates content hash' do
+          driven_request.populate_content_hash
+          expect(request.headers['X-Authorization-Content-SHA256']).to eq('JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=')
         end
 
         it 'refreshes the cached headers' do
-          driven_request.populate_content_md5
-          expect(driven_request.content_md5).to eq('kZXQvrKoieG+Be1rsZVINw==')
+          driven_request.populate_content_hash
+          expect(driven_request.content_hash).to eq('JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=')
         end
       end
 
@@ -147,14 +147,14 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
           )
         end
 
-        it 'populates content-md5' do
-          driven_request.populate_content_md5
-          expect(request.headers['Content-MD5']).to eq('kZXQvrKoieG+Be1rsZVINw==')
+        it 'populates content hash' do
+          driven_request.populate_content_hash
+          expect(request.headers['X-Authorization-Content-SHA256']).to eq('JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=')
         end
 
         it 'refreshes the cached headers' do
-          driven_request.populate_content_md5
-          expect(driven_request.content_md5).to eq('kZXQvrKoieG+Be1rsZVINw==')
+          driven_request.populate_content_hash
+          expect(driven_request.content_hash).to eq('JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=')
         end
       end
 
@@ -167,9 +167,9 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
           )
         end
 
-        it "doesn't populate content-md5" do
-          driven_request.populate_content_md5
-          expect(request.headers['Content-MD5']).to be_nil
+        it "doesn't populate content hash" do
+          driven_request.populate_content_hash
+          expect(request.headers['X-Authorization-Content-SHA256']).to be_nil
         end
       end
     end
@@ -199,7 +199,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
     end
   end
 
-  describe 'md5_mismatch?' do
+  describe 'content_hash_mismatch?' do
     context 'when getting' do
       let(:request) do
         RestClient::Request.new(
@@ -210,7 +210,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
       end
 
       it 'is false' do
-        expect(driven_request.md5_mismatch?).to be false
+        expect(driven_request.content_hash_mismatch?).to be false
       end
     end
 
@@ -228,14 +228,14 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
         let(:request_headers) do
           {
             'Authorization' => 'APIAuth 1044:12345',
-            'Content-MD5' => 'kZXQvrKoieG+Be1rsZVINw==',
+            'X-Authorization-Content-SHA256' => 'JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=',
             'Content-Type' => 'text/plain',
             'Date' => timestamp
           }
         end
 
         it 'is false' do
-          expect(driven_request.md5_mismatch?).to be false
+          expect(driven_request.content_hash_mismatch?).to be false
         end
       end
 
@@ -243,14 +243,14 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
         let(:request_headers) do
           {
             'Authorization' => 'APIAuth 1044:12345',
-            'Content-MD5' => '3',
+            'X-Authorization-Content-SHA256' => '3',
             'Content-Type' => 'text/plain',
             'Date' => timestamp
           }
         end
 
         it 'is true' do
-          expect(driven_request.md5_mismatch?).to be true
+          expect(driven_request.content_hash_mismatch?).to be true
         end
       end
     end
@@ -269,14 +269,14 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
         let(:request_headers) do
           {
             'Authorization' => 'APIAuth 1044:12345',
-            'Content-MD5' => 'kZXQvrKoieG+Be1rsZVINw==',
+            'X-Authorization-Content-SHA256' => 'JsYKYdAdtYNspw/v1EpqAWYgQTyO9fJZpsVhLU9507g=',
             'Content-Type' => 'text/plain',
             'Date' => timestamp
           }
         end
 
         it 'is false' do
-          expect(driven_request.md5_mismatch?).to be false
+          expect(driven_request.content_hash_mismatch?).to be false
         end
       end
 
@@ -284,14 +284,14 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
         let(:request_headers) do
           {
             'Authorization' => 'APIAuth 1044:12345',
-            'Content-MD5' => '3',
+            'X-Authorization-Content-SHA256' => '3',
             'Content-Type' => 'text/plain',
             'Date' => timestamp
           }
         end
 
         it 'is true' do
-          expect(driven_request.md5_mismatch?).to be true
+          expect(driven_request.content_hash_mismatch?).to be true
         end
       end
     end
@@ -306,7 +306,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
       end
 
       it 'is false' do
-        expect(driven_request.md5_mismatch?).to be false
+        expect(driven_request.content_hash_mismatch?).to be false
       end
     end
   end
@@ -385,7 +385,7 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
 
   describe 'edge cases' do
     it "doesn't mess up symbol based headers" do
-      headers = { 'Content-MD5' => 'e59ff97941044f85df5297e1c302d260',
+      headers = { 'X-Authorization-Content-SHA256' => 'e59ff97941044f85df5297e1c302d260',
                   :content_type => 'text/plain',
                   'Date' => 'Mon, 23 Jan 1984 03:29:56 GMT' }
       request = RestClient::Request.new(url: 'http://localhost/resource.xml?foo=bar&bar=foo',
@@ -395,4 +395,10 @@ describe ApiAuth::RequestDrivers::RestClientRequest do
       expect(request.processed_headers).to have_key('Content-Type')
     end
   end
+
+  describe 'fetch_headers' do
+    it 'returns request headers' do
+      expect(driven_request.fetch_headers).to include('CONTENT-TYPE' => 'text/plain')
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -16,8 +16,9 @@ require 'curb'
 require 'http'
 require 'httpi'
 require 'faraday'
+require 'grape'
 require 'net/http/post/multipart'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-auth
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Mauricio Gomes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: amatch
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: grape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +232,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Full HMAC auth implementation for use in your gems and Rails apps.
 email: mauricio@edge14.com
 executables: []
@@ -238,14 +266,10 @@ files:
 - Rakefile
 - VERSION
 - api_auth.gemspec
-- gemfiles/http2.gemfile
-- gemfiles/http3.gemfile
 - gemfiles/http4.gemfile
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_41.gemfile
-- gemfiles/rails_42.gemfile
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
 - lib/api-auth.rb
 - lib/api_auth.rb
 - lib/api_auth/base.rb
@@ -257,12 +281,12 @@ files:
 - lib/api_auth/request_drivers/action_dispatch.rb
 - lib/api_auth/request_drivers/curb.rb
 - lib/api_auth/request_drivers/faraday.rb
+- lib/api_auth/request_drivers/grape_request.rb
 - lib/api_auth/request_drivers/http.rb
 - lib/api_auth/request_drivers/httpi.rb
 - lib/api_auth/request_drivers/net_http.rb
 - lib/api_auth/request_drivers/rack.rb
 - lib/api_auth/request_drivers/rest_client.rb
-- spec/.rubocop.yml
 - spec/api_auth_spec.rb
 - spec/fixtures/upload.png
 - spec/headers_spec.rb
@@ -272,6 +296,7 @@ files:
 - spec/request_drivers/action_dispatch_spec.rb
 - spec/request_drivers/curb_spec.rb
 - spec/request_drivers/faraday_spec.rb
+- spec/request_drivers/grape_request_spec.rb
 - spec/request_drivers/http_spec.rb
 - spec/request_drivers/httpi_spec.rb
 - spec/request_drivers/net_http_spec.rb
@@ -281,7 +306,7 @@ files:
 homepage: https://github.com/mgomes/api_auth
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,16 +314,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Simple HMAC authentication for your APIs
 test_files:
@@ -311,6 +335,7 @@ test_files:
 - spec/request_drivers/action_dispatch_spec.rb
 - spec/request_drivers/curb_spec.rb
 - spec/request_drivers/faraday_spec.rb
+- spec/request_drivers/grape_request_spec.rb
 - spec/request_drivers/http_spec.rb
 - spec/request_drivers/httpi_spec.rb
 - spec/request_drivers/net_http_spec.rb

data/gemfiles/http2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "http", "~> 2.0"
-
-gemspec :path => "../"

data/gemfiles/http3.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "http", "~> 3.0"
-
-gemspec :path => "../"