rack-oauth2 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c3515e2af90285deab9032fece3d0ef8c7445405cc1cce705160c19fb2052b
-  data.tar.gz: e95c0fca744d8d12d97e1be23ff48cb00250d92a536de03382021e73e809c737
+  metadata.gz: 94653e24ca67ef301c4d5e9b2d5af0775feefe07c32e9fc5dba855f178a39e11
+  data.tar.gz: c25b475ef9941aaadaed62133f217425d325efc92d21ef3bf224ebcddd8e1045
 SHA512:
-  metadata.gz: 6c2a9ddb2f9b4b9d18c337d678bf88d660f3597d09ec9d63195062cd1c5fc0a3c5105135f51aa1f4efef4e64b9e66c2a6f36dc6b4037b5c09cefbace858ce67e
-  data.tar.gz: e0add9d0227669a3cfd6e11c208bc36f89c13ec8cda2ab2352bb9b0d29ee0ac59b266aee90732c4e756895fc8d66ebaefdd4defe5342392e67e08d9022514da9
+  metadata.gz: 8be19c6c289dae2df63c294a15fd9e63445ae623142b79769b4b5ee475bc3fe524e6bbb88a9ccea64ece7240c04b0c909eba87e8c03e7ff250c20e6d0b922431
+  data.tar.gz: e26e13a85c9d3da1d811500d1488100ae0b7bb358752d7df9cf45d062cf885b8537b5a6e691e76a9bbe8590355ba5383a1de39adcf150f50f0f4f172ef545d72

data/.github/workflows/spec.yml

@@ -11,21 +11,20 @@ permissions:
 
 jobs:
   spec:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        os: ['ubuntu-20.04', 'ubuntu-22.04']
-        ruby-version: ['3.1', '3.2', '3.3']
-        include:
-        - os: 'ubuntu-20.04'
-          ruby-version: '3.0'
-    runs-on: ${{ matrix.os }}
-
+        ruby:
+          - '3.2'
+          - '3.3'
+          - '3.4'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - name: Run Specs
       run: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## [Unreleased]
 
+- add support for endpoints requiring mTLS with HTTP Basic Authentication
+
 ## [2.2.0] - 2022-10-11
 
 ### Changed

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.3.0

data/lib/rack/oauth2/client.rb

@@ -182,6 +182,16 @@ module Rack
           )
           http_client.ssl.client_key = private_key
           http_client.ssl.client_cert = certificate
+        when :mtls_basic
+          http_client.ssl.client_key = private_key
+          http_client.ssl.client_cert = certificate
+          cred = Base64.strict_encode64 [
+            Util.www_form_url_encode(identifier),
+            Util.www_form_url_encode(secret)
+          ].join(':')
+          headers.merge!(
+            'Authorization' => "Basic #{cred}"
+          )
         else
           params.merge!(
             client_id: identifier,

data/lib/rack/oauth2/server/abstract/error.rb

@@ -3,7 +3,7 @@ module Rack
     module Server
       module Abstract
         class Error < StandardError
-          attr_accessor :status, :error, :description, :uri, :realm
+          attr_accessor :status, :error, :description, :uri, :realm, :resource_metadata
 
           def initialize(status, error, description = nil, options = {})
             @status      = status
@@ -11,6 +11,7 @@ module Rack
             @description = description
             @uri         = options[:uri]
             @realm       = options[:realm]
+            @resource_metadata = options[:resource_metadata]
             super [error, description].compact.join(' :: ')
           end
 

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

@@ -19,6 +19,7 @@ module Rack
                 headers << ", error_description=\"#{description}\"" if description.present?
                 headers << ", error_uri=\"#{uri}\""                 if uri.present?
               end
+              headers << ", resource_metadata=\"#{resource_metadata}\"" if resource_metadata.present?
             end
           end
         end

data/spec/rack/oauth2/server/authorize_spec.rb

@@ -158,7 +158,10 @@ describe Rack::OAuth2::Server::Authorize do
       Rack::MockRequest.env_for("/authorize?response_type=#{response_type}&client_id=client")
     end
     let(:request) { Rack::OAuth2::Server::Authorize::Request.new env }
-    its(:extensions) { should == [Rack::OAuth2::Server::Authorize::Extension::CodeAndToken] }
+
+    it do
+      subject.send(:extensions).should == [Rack::OAuth2::Server::Authorize::Extension::CodeAndToken]
+    end
 
     describe 'code token' do
       let(:response_type) { 'code%20token' }
@@ -196,8 +199,8 @@ describe Rack::OAuth2::Server::Authorize do
         end
       end
 
-      its(:extensions) do
-        should == [
+      it do
+        subject.send(:extensions).should == [
           Rack::OAuth2::Server::Authorize::Extension::CodeAndToken,
           Rack::OAuth2::Server::Authorize::Extension::IdToken
         ]

data/spec/rack/oauth2/server/resource/error_spec.rb

@@ -77,6 +77,17 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
           response.first.should include '"error":"something"'
         end
       end
+
+      context 'when resource_metadata is specified' do
+        let(:resource_metadata) { "https://resource.example.com/.well-known/oauth-protected-resource" }
+        let(:error) { Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(:something, nil, resource_metadata: resource_metadata) }
+
+        it 'should include resource_metadata in WWW-Authenticate header' do
+          _, headers, response = error_with_scheme.finish
+          headers['WWW-Authenticate'].should include %(resource_metadata="#{resource_metadata}")
+          response.first.should include '"error":"something"'
+        end
+      end
     end
   end
 end

data/spec/rack/oauth2/server/token_spec.rb

@@ -183,7 +183,10 @@ describe Rack::OAuth2::Server::Token do
       )
     end
     let(:request) { Rack::OAuth2::Server::Token::Request.new env }
-    its(:extensions) { should == [Rack::OAuth2::Server::Token::Extension::Example] }
+
+    it do
+      subject.send(:extensions).should == [Rack::OAuth2::Server::Token::Extension::Example]
+    end
 
     describe 'JWT assertion' do
       let(:params) do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - nov matake
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -293,7 +292,6 @@ homepage: https://github.com/nov/rack-oauth2
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -309,8 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: OAuth 2.0 Server & Client Library - Both Bearer token type are supported
 test_files: