rack-oauth2 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc7128ddb3f69d32ef87154ce7d5bd96442b726091310af1908c25f74d67839c
-  data.tar.gz: 76b20c6388c1a58a25a52ef1d16715fa249c157c766a9164273bdda54af40a98
+  metadata.gz: 547320a1fd9f9814f0ab3e8b9ffca9ed63c9eb97cdd540a6782ad65b1904d27e
+  data.tar.gz: f691811b07ea68a741509de51076275f83169009cf3723fbde91718f8bcfb4ea
 SHA512:
-  metadata.gz: 3a5ffc9eed6fc716e211acb14bbc693b532d50d21008fc413ca3f7c0f9b5d4571fd23fe365f1dd78689d71466eab0faf8607b84553ef1160ac083d7fddf3feec
-  data.tar.gz: d77258ced147d675e4cf834988c322c687689152bdc9e5e1e0cc9c46300a609a3d91d0016c42065c4d444081b9804bcdb6436aa75276b63f7c9bb52a6a52c3f1
+  metadata.gz: f5f2c5d853d8f17d04b7020fd0fa72edf43470eab5bb532ecb05a238956755dcafb32051629e77f9f451e38bf73a4f171e8b20d4c4f606b33b3523923d733cfc
+  data.tar.gz: 9a3f31dc3696817c801441267b50b6839e91588a30d7e838987356ffba4595a75a4b165e5ba5f05f43aabe4848a3550330f3bf19895ca2d0338372f914d150a9

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

data/lib/rack/oauth2/access_token.rb

@@ -38,3 +38,4 @@ 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/access_token/bearer.rb

@@ -5,7 +5,14 @@ module Rack
         def authenticate(request)
           request.header["Authorization"] = "Bearer #{access_token}"
         end
+
+        def to_mtls(attributes = {})
+          (required_attributes + optional_attributes).each do |key|
+            attributes[key] = self.send(key)
+          end
+          MTLS.new attributes
+        end
       end
     end
   end
-end
+end

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

@@ -0,0 +1,16 @@
+module Rack
+  module OAuth2
+    class AccessToken
+      class MTLS < Bearer
+        attr_required :private_key, :certificate
+
+        def initialize(attributes = {})
+          super
+          self.token_type = :bearer
+          httpclient.ssl_config.client_key = private_key
+          httpclient.ssl_config.client_cert = certificate
+        end
+      end
+    end
+  end
+end

data/lib/rack/oauth2/client.rb

@@ -3,7 +3,7 @@ module Rack
     class Client
       include AttrRequired, AttrOptional
       attr_required :identifier
-      attr_optional :secret, :private_key, :redirect_uri, :scheme, :host, :port, :authorization_endpoint, :token_endpoint
+      attr_optional :secret, :private_key, :certificate, :redirect_uri, :scheme, :host, :port, :authorization_endpoint, :token_endpoint
 
       def initialize(attributes = {})
         (required_attributes + optional_attributes).each do |key|
@@ -70,6 +70,7 @@ module Rack
 
       def access_token!(*args)
         headers, params = {}, @grant.as_json
+        http_client = Rack::OAuth2.http_client
 
         # NOTE:
         #  Using Array#estract_options! for backward compatibility.
@@ -106,6 +107,12 @@ module Rack
           params.merge!(
             client_assertion_type: URN::ClientAssertionType::SAML2_BEARER
           )
+        when :mtls
+          params.merge!(
+            client_id: identifier
+          )
+          http_client.ssl_config.client_key = private_key
+          http_client.ssl_config.client_cert = certificate
         else
           params.merge!(
             client_id: identifier,
@@ -113,7 +120,7 @@ module Rack
           )
         end
         handle_response do
-          Rack::OAuth2.http_client.post(
+          http_client.post(
             absolute_uri_for(token_endpoint),
             Util.compact_hash(params),
             headers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -177,6 +177,7 @@ files:
 - 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
 - lib/rack/oauth2/client/grant.rb
@@ -301,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported