rack-oauth2 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efedb22bf2d26cfc59bff3d5742144e6d456099f
-  data.tar.gz: 70d6b0c26c8c877b565a57a3c45e60a2cc06c6ac
+  metadata.gz: cbac894ed9163540ac519a063032626b0a76207d
+  data.tar.gz: 8c6b39c0c3b6477fe59d507e563f81dc20e6b81a
 SHA512:
-  metadata.gz: 5af294837dac819581056e65a265af1680cdaa194c9e21cf2f6736486c77733f8315f0a263c811df042d93b1756ca08df1db22ce4f7bb4b89f86d13837646a66
-  data.tar.gz: ce468e48663cbd68e13b8b208a6f82139c7e2ee9b1bf051a91083351008017d03721f2197d1a6b53272c7247acb2cd7435823fc2ee6cccb3219136976e23f574
+  metadata.gz: 321b9d515d5926a653c16f9dd3a58cdf900872810218bc7aad37c473b39cec07cca3579ef4b5c16ad3ba93e74eee56b0cf43711f61b04724fbf6639af8d5bb71
+  data.tar.gz: 27aec030fe85e7ef03efff02cd08b8388a2e317d2e10a6fed9cf0e3bff4052185b8545543cf4d581d9e1a0bda23368b55033398132165b068b2c184e33e31124

data/Gemfile

@@ -1,7 +1,7 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 platforms :jruby do
   gem 'jruby-openssl', '>= 0.7'
 end
 
-gemspec
+gemspec

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/lib/rack/oauth2/client.rb

@@ -3,7 +3,7 @@ module Rack
     class Client
       include AttrRequired, AttrOptional
       attr_required :identifier
-      attr_optional :secret, :redirect_uri, :scheme, :host, :port, :authorization_endpoint, :token_endpoint
+      attr_optional :secret, :private_key, :redirect_uri, :scheme, :host, :port, :authorization_endpoint, :token_endpoint
 
       def initialize(attributes = {})
         (required_attributes + optional_attributes).each do |key|
@@ -90,6 +90,18 @@ module Rack
           params.merge!(
             client_assertion_type: URN::ClientAssertionType::JWT_BEARER
           )
+          # NOTE: optionally auto-generate client_assertion.
+          if params[:client_assertion].blank?
+            require 'json/jwt'
+            params[:client_assertion] = JSON::JWT.new(
+              iss: identifier,
+              sub: identifier,
+              aud: absolute_uri_for(token_endpoint),
+              jti: SecureRandom.hex(16),
+              iat: Time.now,
+              exp: 3.minutes.from_now
+            ).sign(private_key || secret).to_s
+          end
         when :saml2_bearer
           params.merge!(
             client_assertion_type: URN::ClientAssertionType::SAML2_BEARER

data/rack-oauth2.gemspec

@@ -1,26 +1,26 @@
 Gem::Specification.new do |s|
-  s.name = "rack-oauth2"
-  s.version = File.read("VERSION")
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-  s.authors = ["nov matake"]
+  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.email = "nov@matake.jp"
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.homepage = "http://github.com/nov/rack-oauth2"
+  s.email = 'nov@matake.jp'
+  s.extra_rdoc_files = ['LICENSE', 'README.rdoc']
+  s.rdoc_options = ['--charset=UTF-8']
+  s.homepage = 'http://github.com/nov/rack-oauth2'
   s.license = 'MIT'
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.add_runtime_dependency "rack", ">= 1.1"
-  s.add_runtime_dependency "httpclient", ">= 2.4"
-  s.add_runtime_dependency "activesupport", ">= 2.3"
-  s.add_runtime_dependency "attr_required", ">= 0.0.5"
-  s.add_development_dependency "rake", ">= 0.8"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-its"
-  s.add_development_dependency "webmock", "< 1.24"
+  s.add_runtime_dependency 'rack'
+  s.add_runtime_dependency 'httpclient'
+  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'attr_required'
+  s.add_runtime_dependency 'json-jwt'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-its'
+  s.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,70 +16,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_required
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +140,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
 description: OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are
   supported.
 email: nov@matake.jp
@@ -284,10 +298,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported