rack-oauth2 1.21.3 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7303cf85e66a7fb4a89d66d95b4ad35720ecb95459f9740208328314ea54b157
-  data.tar.gz: 061a4a30cbb25212979a37f26e18043cbf71dead3e36981b37f6152fc6899cfd
+  metadata.gz: 1cb4411750fe56e3e1d57b739554197d1ea4420833d01239498c3658e18347bf
+  data.tar.gz: e06e73134550dcb58ed74716faa6b8180ecf3da33f1237ebd3533c7e73cac533
 SHA512:
-  metadata.gz: 5fbabf81d770e80f02614d3b00b0fd9db8a63ed695a5b67b74266eee1f09ec6e7045db009ea7e6ee09af84680699809032ecc64d58caee48305573cd3532b5be
-  data.tar.gz: 5bc8cdbdddb9a997560eab574a955ab69d3ad8f9e594554a45d17e077991c2551382c917363c1c09db349abf262f5d9c15a7cfb13c24e56fe27d83cbde62f0f3
+  metadata.gz: 2166159ab59d7885c7e53833c20480eec38035e2d61e4aa23fe62afabacc6a5e4289ce527ad78ffbaac89f317b495957afb4f8be21e9cc38c937e6f0ad42f8e3
+  data.tar.gz: 0e381b83f45be184850dc8301be85db57800b317e822cc67f8c08e925df96780b828c330012aa0c22b14ee89c8f884fc9de1ac587a2faab4bd01295b4ea04c06

data/.github/workflows/spec.yml

@@ -2,6 +2,8 @@ name: Spec
 
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 permissions:

data/README.rdoc

@@ -1,9 +1,7 @@
 = rack-oauth2
 
 OAuth 2.0 Server & Client Library.
-Both Bearer and MAC token type are supported.
-
-{<img src="https://secure.travis-ci.org/nov/rack-oauth2.png" />}[http://travis-ci.org/nov/rack-oauth2]
+Both Bearer token type are supported.
 
 The OAuth 2.0 Authorization Framework (RFC 6749)
 http://www.rfc-editor.org/rfc/rfc6749.txt
@@ -11,9 +9,6 @@ http://www.rfc-editor.org/rfc/rfc6749.txt
 The OAuth 2.0 Authorization Framework: Bearer Token Usage (RFC 6750)
 http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-06
 
-HTTP Authentication: MAC Access Authentication (draft 01)
-http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
-
 == Installation
 
   gem install rack-oauth2
@@ -31,31 +26,17 @@ http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
 Source on GitHub
 https://github.com/nov/rack-oauth2-sample
 
-=== MAC
-
-Source on GitHub
-https://github.com/nov/rack-oauth2-sample-mac
-
 == Sample Client
 
-=== Common between Bearer and MAC
-
 Authorization Request (request_type: 'code' and 'token')
 https://gist.github.com/862393
 
 Token Request (grant_type: 'client_credentials', 'password', 'authorization_code' and 'refresh_token')
 https://gist.github.com/883541
 
-=== Bearer
-
 Resource Request (request both for resource owner resource and for client resource)
 https://gist.github.com/883575
 
-=== MAC
-
-Resource Request (request both for resource owner resource and for client resource)
-https://gist.github.com/933885
-
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-1.21.3
+2.0.0.rc1

data/lib/rack/oauth2/access_token/authenticator.rb

@@ -6,18 +6,9 @@ module Rack
           @token = token
         end
 
-        # Callback called in HTTPClient (before sending a request)
-        # request:: HTTP::Message
-        def filter_request(request)
+        def authenticate(request)
           @token.authenticate(request)
         end
-
-        # Callback called in HTTPClient (after received a response)
-        # response:: HTTP::Message
-        # request::  HTTP::Message
-        def filter_response(response, request)
-          # nothing to do
-        end
       end
     end
   end

data/lib/rack/oauth2/access_token/bearer.rb

@@ -3,7 +3,7 @@ module Rack
     class AccessToken
       class Bearer < AccessToken
         def authenticate(request)
-          request.header["Authorization"] = "Bearer #{access_token}"
+          request.headers["Authorization"] = "Bearer #{access_token}"
         end
 
         def to_mtls(attributes = {})

data/lib/rack/oauth2/access_token/legacy.rb

@@ -11,7 +11,7 @@ module Rack
         end
 
         def authenticate(request)
-          request.header["Authorization"] = "OAuth #{access_token}"
+          request.headers["Authorization"] = "OAuth #{access_token}"
         end
       end
     end

data/lib/rack/oauth2/access_token.rb

@@ -19,8 +19,8 @@ module Rack
       end
 
       def httpclient
-        @httpclient ||= Rack::OAuth2.http_client("#{self.class} (#{VERSION})") do |config|
-          config.request_filter << Authenticator.new(self)
+        @httpclient ||= Rack::OAuth2.http_client("#{self.class} (#{VERSION})") do |faraday|
+          Authenticator.new(self).authenticate(faraday)
         end
       end
 
@@ -39,6 +39,5 @@ end
 
 require 'rack/oauth2/access_token/authenticator'
 require 'rack/oauth2/access_token/bearer'
-require 'rack/oauth2/access_token/mac'
 require 'rack/oauth2/access_token/legacy'
 require 'rack/oauth2/access_token/mtls'

data/lib/rack/oauth2/client.rb

@@ -76,7 +76,7 @@ module Rack
         handle_response do
           http_client.post(
             absolute_uri_for(token_endpoint),
-            Util.compact_hash(params),
+            Util.compact_hash(params).to_query,
             headers
           )
         end
@@ -213,8 +213,6 @@ module Rack
         case (@forced_token_type || token_hash[:token_type]).try(:downcase)
         when 'bearer'
           AccessToken::Bearer.new(token_hash)
-        when 'mac'
-          AccessToken::MAC.new(token_hash)
         when nil
           AccessToken::Legacy.new(token_hash)
         else

data/lib/rack/oauth2/server/resource.rb

@@ -52,4 +52,3 @@ end
 
 require 'rack/oauth2/server/resource/error'
 require 'rack/oauth2/server/resource/bearer'
-require 'rack/oauth2/server/resource/mac'

data/lib/rack/oauth2.rb

@@ -1,5 +1,6 @@
 require 'rack'
-require 'httpclient'
+require 'faraday'
+require 'faraday/follow_redirects'
 require 'logger'
 require 'active_support'
 require 'active_support/core_ext'
@@ -40,18 +41,12 @@ module Rack
     self.debugging = false
 
     def self.http_client(agent_name = "Rack::OAuth2 (#{VERSION})", &local_http_config)
-      _http_client_ = HTTPClient.new(
-        agent_name: agent_name
-      )
-
-      # NOTE: httpclient gem seems stopped maintaining root certtificate set, use OS default.
-      _http_client_.ssl_config.clear_cert_store
-      _http_client_.ssl_config.cert_store.set_default_paths
-
-      http_config.try(:call, _http_client_)
-      local_http_config.try(:call, _http_client_) unless local_http_config.nil?
-      _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
-      _http_client_
+      Faraday.new(headers: {user_agent: agent_name}) do |faraday|
+        faraday.response :logger, Rack::OAuth2.logger if debugging?
+        faraday.adapter Faraday.default_adapter
+        local_http_config&.call(faraday)
+        http_config&.call(faraday)
+      end
     end
 
     def self.http_config(&block)
@@ -70,4 +65,3 @@ require 'rack/oauth2/util'
 require 'rack/oauth2/server'
 require 'rack/oauth2/client'
 require 'rack/oauth2/access_token'
-require 'rack/oauth2/debugger'

data/rack-oauth2.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name = 'rack-oauth2'
   s.version = File.read('VERSION')
   s.authors = ['nov matake']
-  s.description = %q{OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are supported.}
-  s.summary = %q{OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported}
+  s.description = %q{OAuth 2.0 Server & Client Library. Both Bearer token type are supported.}
+  s.summary = %q{OAuth 2.0 Server & Client Library - Both Bearer token type are supported}
   s.email = 'nov@matake.jp'
   s.extra_rdoc_files = ['LICENSE', 'README.rdoc']
   s.rdoc_options = ['--charset=UTF-8']
@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.add_runtime_dependency 'rack', '>= 2.1.0'
-  s.add_runtime_dependency 'httpclient'
+  s.add_runtime_dependency 'faraday', '~> 2.0'
+  s.add_runtime_dependency 'faraday-follow_redirects'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'attr_required'
   s.add_runtime_dependency 'json-jwt', '>= 1.11.0'

data/spec/rack/oauth2/access_token/authenticator_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Rack::OAuth2::AccessToken::Authenticator do
   let(:resource_endpoint) { 'https://server.example.com/resources/fake' }
-  let(:request) { HTTP::Message.new_request(:get, URI.parse(resource_endpoint)) }
+  let(:request) { Faraday::Request.new(:get, URI.parse(resource_endpoint)) }
   let(:authenticator) { Rack::OAuth2::AccessToken::Authenticator.new(token) }
 
   shared_examples_for :authenticator do
     it 'should let the token authenticate the request' do
       expect(token).to receive(:authenticate).with(request)
-      authenticator.filter_request(request)
+      authenticator.authenticate(request)
     end
   end
 
@@ -29,15 +29,4 @@ describe Rack::OAuth2::AccessToken::Authenticator do
     end
     it_behaves_like :authenticator
   end
-
-  context 'when MAC token is given' do
-    let(:token) do
-      Rack::OAuth2::AccessToken::MAC.new(
-        access_token: 'access_token',
-        mac_key: 'secret',
-        mac_algorithm: 'hmac-sha-256'
-      )
-    end
-    it_behaves_like :authenticator
-  end
 end

data/spec/rack/oauth2/access_token/bearer_spec.rb

@@ -7,11 +7,11 @@ describe Rack::OAuth2::AccessToken::Bearer do
     )
   end
   let(:resource_endpoint) { 'https://server.example.com/resources/fake' }
-  let(:request) { HTTPClient.new.send(:create_request, :post, URI.parse(resource_endpoint), {}, {hello: "world"}, {}) }
+  let(:request) { Faraday::Request.new(:post, URI.parse(resource_endpoint), '', {hello: "world"}, {}) }
 
   describe '.authenticate' do
     it 'should set Authorization header' do
-      expect(request.header).to receive(:[]=).with('Authorization', 'Bearer access_token')
+      expect(request.headers).to receive(:[]=).with('Authorization', 'Bearer access_token')
       token.authenticate(request)
     end
   end

data/spec/rack/oauth2/access_token/legacy_spec.rb

@@ -7,7 +7,7 @@ describe Rack::OAuth2::AccessToken::Legacy do
     )
   end
   let(:resource_endpoint) { 'https://server.example.com/resources/fake' }
-  let(:request) { HTTPClient.new.send(:create_request, :post, URI.parse(resource_endpoint), {}, {hello: "world"}, {}) }
+  let(:request) { Faraday::Request.new(:post, URI.parse(resource_endpoint), '', {hello: "world"}, {}) }
 
   describe '#to_s' do
     subject { token }
@@ -16,7 +16,7 @@ describe Rack::OAuth2::AccessToken::Legacy do
 
   describe '.authenticate' do
     it 'should set Authorization header' do
-      expect(request.header).to receive(:[]=).with('Authorization', 'OAuth access_token')
+      expect(request.headers).to receive(:[]=).with('Authorization', 'OAuth access_token')
       token.authenticate(request)
     end
   end

data/spec/rack/oauth2/access_token_spec.rb

@@ -49,23 +49,6 @@ describe Rack::OAuth2::AccessToken do
 
   let(:resource_endpoint) { 'https://server.example.com/resources/fake' }
   [:get, :delete, :post, :put].each do |method|
-    describe method do
-      it 'should delegate to HTTPClient with Authenticator filter' do
-        expect(token.httpclient).to receive(method).with(resource_endpoint)
-        token.httpclient.request_filter.last.should be_a Rack::OAuth2::AccessToken::Authenticator
-        token.send method, resource_endpoint
-      end
-    end
-
-    context 'in debug mode' do
-      it do
-        Rack::OAuth2.debug do
-          token.httpclient.request_filter[-2].should be_a Rack::OAuth2::AccessToken::Authenticator
-          token.httpclient.request_filter.last.should be_a Rack::OAuth2::Debugger::RequestFilter
-        end
-      end
-    end
-
     context 'when extension params given' do
       subject do
         Rack::OAuth2::AccessToken::Bearer.new(

data/spec/rack/oauth2/client_spec.rb

@@ -338,22 +338,6 @@ describe Rack::OAuth2::Client do
       end
     end
 
-    context 'when mac token is given' do
-      before do
-        client.authorization_code = 'code'
-        mock_response(
-          :post,
-          'https://server.example.com/oauth2/token',
-          'tokens/mac.json'
-        )
-      end
-      it { should be_instance_of Rack::OAuth2::AccessToken::MAC }
-      its(:token_type) { should == :mac }
-      its(:access_token) { should == 'access_token' }
-      its(:refresh_token) { should == 'refresh_token' }
-      its(:expires_in) { should == 3600 }
-    end
-
     context 'when no-type token is given (JSON)' do
       before do
         client.authorization_code = 'code'

data/spec/rack/oauth2/oauth2_spec.rb

@@ -28,47 +28,4 @@ describe Rack::OAuth2 do
       Rack::OAuth2.debugging?.should == true
     end
   end
-
-  describe '.http_config' do
-    context 'when request_filter added' do
-      context 'when "debug!" is called' do
-        after { Rack::OAuth2.reset_http_config! }
-
-        it 'should put Debugger::RequestFilter at last' do
-          Rack::OAuth2.debug!
-          Rack::OAuth2.http_config do |config|
-            config.request_filter << Proc.new {}
-          end
-          Rack::OAuth2.http_client.request_filter.last.should be_instance_of Rack::OAuth2::Debugger::RequestFilter
-        end
-
-        it 'should reset_http_config' do
-          Rack::OAuth2.debug!
-          Rack::OAuth2.http_config do |config|
-            config.request_filter << Proc.new {}
-          end
-          size = Rack::OAuth2.http_client.request_filter.size
-          Rack::OAuth2.reset_http_config!
-          Rack::OAuth2.http_client.request_filter.size.should == size - 1
-        end
-
-      end
-    end
-  end
-
-  describe ".http_client" do
-    context "when local_http_config is used" do
-      it "should correctly set request_filter" do
-        clnt1 = Rack::OAuth2.http_client
-        clnt2 = Rack::OAuth2.http_client("my client") do |config|
-          config.request_filter << Proc.new {}
-        end
-        clnt3 = Rack::OAuth2.http_client
-
-        clnt1.request_filter.size.should == clnt3.request_filter.size
-        clnt1.request_filter.size.should == clnt2.request_filter.size - 1
-
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.21.3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - nov matake
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,8 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are
-  supported.
+description: OAuth 2.0 Server & Client Library. Both Bearer token type are supported.
 email: nov@matake.jp
 executables: []
 extensions: []
@@ -178,7 +191,6 @@ files:
 - ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -189,10 +201,6 @@ files:
 - lib/rack/oauth2/access_token/authenticator.rb
 - lib/rack/oauth2/access_token/bearer.rb
 - lib/rack/oauth2/access_token/legacy.rb
-- lib/rack/oauth2/access_token/mac.rb
-- lib/rack/oauth2/access_token/mac/sha256_hex_verifier.rb
-- lib/rack/oauth2/access_token/mac/signature.rb
-- lib/rack/oauth2/access_token/mac/verifier.rb
 - lib/rack/oauth2/access_token/mtls.rb
 - lib/rack/oauth2/client.rb
 - lib/rack/oauth2/client/error.rb
@@ -204,8 +212,6 @@ files:
 - lib/rack/oauth2/client/grant/refresh_token.rb
 - lib/rack/oauth2/client/grant/saml2_bearer.rb
 - lib/rack/oauth2/client/grant/token_exchange.rb
-- lib/rack/oauth2/debugger.rb
-- lib/rack/oauth2/debugger/request_filter.rb
 - lib/rack/oauth2/server.rb
 - lib/rack/oauth2/server/abstract.rb
 - lib/rack/oauth2/server/abstract/error.rb
@@ -228,8 +234,6 @@ files:
 - lib/rack/oauth2/server/resource/bearer.rb
 - lib/rack/oauth2/server/resource/bearer/error.rb
 - lib/rack/oauth2/server/resource/error.rb
-- lib/rack/oauth2/server/resource/mac.rb
-- lib/rack/oauth2/server/resource/mac/error.rb
 - lib/rack/oauth2/server/token.rb
 - lib/rack/oauth2/server/token/authorization_code.rb
 - lib/rack/oauth2/server/token/client_credentials.rb
@@ -253,15 +257,10 @@ files:
 - spec/mock_response/tokens/legacy.json
 - spec/mock_response/tokens/legacy.txt
 - spec/mock_response/tokens/legacy_without_expires_in.txt
-- spec/mock_response/tokens/mac.json
 - spec/mock_response/tokens/unknown.json
 - spec/rack/oauth2/access_token/authenticator_spec.rb
 - spec/rack/oauth2/access_token/bearer_spec.rb
 - spec/rack/oauth2/access_token/legacy_spec.rb
-- spec/rack/oauth2/access_token/mac/sha256_hex_verifier_spec.rb
-- spec/rack/oauth2/access_token/mac/signature_spec.rb
-- spec/rack/oauth2/access_token/mac/verifier_spec.rb
-- spec/rack/oauth2/access_token/mac_spec.rb
 - spec/rack/oauth2/access_token_spec.rb
 - spec/rack/oauth2/client/error_spec.rb
 - spec/rack/oauth2/client/grant/authorization_code_spec.rb
@@ -271,7 +270,6 @@ files:
 - spec/rack/oauth2/client/grant/refresh_token_spec.rb
 - spec/rack/oauth2/client/grant/saml2_bearer_spec.rb
 - spec/rack/oauth2/client_spec.rb
-- spec/rack/oauth2/debugger/request_filter_spec.rb
 - spec/rack/oauth2/oauth2_spec.rb
 - spec/rack/oauth2/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
@@ -284,8 +282,6 @@ files:
 - spec/rack/oauth2/server/resource/bearer/error_spec.rb
 - spec/rack/oauth2/server/resource/bearer_spec.rb
 - spec/rack/oauth2/server/resource/error_spec.rb
-- spec/rack/oauth2/server/resource/mac/error_spec.rb
-- spec/rack/oauth2/server/resource/mac_spec.rb
 - spec/rack/oauth2/server/resource_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
 - spec/rack/oauth2/server/token/client_credentials_spec.rb
@@ -313,14 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported
+summary: OAuth 2.0 Server & Client Library - Both Bearer token type are supported
 test_files:
 - spec/helpers/time.rb
 - spec/helpers/webmock_helper.rb
@@ -332,15 +328,10 @@ test_files:
 - spec/mock_response/tokens/legacy.json
 - spec/mock_response/tokens/legacy.txt
 - spec/mock_response/tokens/legacy_without_expires_in.txt
-- spec/mock_response/tokens/mac.json
 - spec/mock_response/tokens/unknown.json
 - spec/rack/oauth2/access_token/authenticator_spec.rb
 - spec/rack/oauth2/access_token/bearer_spec.rb
 - spec/rack/oauth2/access_token/legacy_spec.rb
-- spec/rack/oauth2/access_token/mac/sha256_hex_verifier_spec.rb
-- spec/rack/oauth2/access_token/mac/signature_spec.rb
-- spec/rack/oauth2/access_token/mac/verifier_spec.rb
-- spec/rack/oauth2/access_token/mac_spec.rb
 - spec/rack/oauth2/access_token_spec.rb
 - spec/rack/oauth2/client/error_spec.rb
 - spec/rack/oauth2/client/grant/authorization_code_spec.rb
@@ -350,7 +341,6 @@ test_files:
 - spec/rack/oauth2/client/grant/refresh_token_spec.rb
 - spec/rack/oauth2/client/grant/saml2_bearer_spec.rb
 - spec/rack/oauth2/client_spec.rb
-- spec/rack/oauth2/debugger/request_filter_spec.rb
 - spec/rack/oauth2/oauth2_spec.rb
 - spec/rack/oauth2/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
@@ -363,8 +353,6 @@ test_files:
 - spec/rack/oauth2/server/resource/bearer/error_spec.rb
 - spec/rack/oauth2/server/resource/bearer_spec.rb
 - spec/rack/oauth2/server/resource/error_spec.rb
-- spec/rack/oauth2/server/resource/mac/error_spec.rb
-- spec/rack/oauth2/server/resource/mac_spec.rb
 - spec/rack/oauth2/server/resource_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
 - spec/rack/oauth2/server/token/client_credentials_spec.rb

data/.travis.yml

@@ -1,8 +0,0 @@
-before_install:
-  - gem install bundler
-
-rvm:
-  - 2.6.10
-  - 2.7.6
-  - 3.0.4
-  - 3.1.2

data/lib/rack/oauth2/access_token/mac/sha256_hex_verifier.rb

@@ -1,17 +0,0 @@
-module Rack
-  module OAuth2
-    class AccessToken
-      class MAC
-        class Sha256HexVerifier < Verifier
-          attr_optional :raw_body
-
-          def calculate
-            return nil unless raw_body.present?
-            
-            OpenSSL::Digest::SHA256.new.digest(raw_body).unpack('H*').first
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rack/oauth2/access_token/mac/signature.rb

@@ -1,34 +0,0 @@
-module Rack
-  module OAuth2
-    class AccessToken
-      class MAC
-        class Signature < Verifier
-          attr_required :secret, :ts, :nonce, :method, :request_uri, :host, :port
-          attr_optional :ext, :query
-
-          def calculate
-            Rack::OAuth2::Util.base64_encode OpenSSL::HMAC.digest(
-              hash_generator,
-              secret,
-              normalized_request_string
-            )
-          end
-
-          def normalized_request_string
-            [
-              ts.to_i,
-              nonce,
-              method.to_s.upcase,
-              request_uri,
-              host,
-              port,
-              ext || '',
-              nil
-            ].join("\n")
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/rack/oauth2/access_token/mac/verifier.rb

@@ -1,44 +0,0 @@
-module Rack
-  module OAuth2
-    class AccessToken
-      class MAC
-        class Verifier
-          include AttrRequired, AttrOptional
-          attr_required :algorithm
-
-          class VerificationFailed < StandardError; end
-
-          def initialize(attributes = {})
-            (required_attributes + optional_attributes).each do |key|
-              self.send :"#{key}=", attributes[key]
-            end
-            attr_missing!
-          rescue AttrRequired::AttrMissing => e
-            raise VerificationFailed.new("#{self.class.name.demodulize} Invalid: #{e.message}")
-          end
-
-          def verify!(expected)
-            if expected == self.calculate
-              :verified
-            else
-              raise VerificationFailed.new("#{self.class.name.demodulize} Invalid")
-            end
-          end
-
-          private
-
-          def hash_generator
-            case algorithm.to_s
-            when 'hmac-sha-1'
-              OpenSSL::Digest::SHA1.new
-            when 'hmac-sha-256'
-              OpenSSL::Digest::SHA256.new
-            else
-              raise 'Unsupported Algorithm'
-            end
-          end
-        end
-      end
-    end
-  end
-end