doorkeeper 5.9.5 → 5.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e4ee342094b7729f29bb64d9045cfd9736d99388c5bb15d68568c6d59a8a54
-  data.tar.gz: e1549e74f00d26b85ed9afedbfaba17adce5a4e8a62c5ee01a8c4ff70c71bbcf
+  metadata.gz: 233efb73ba5d84b316e665251df23989888d403dd553cd34375891645c00eb14
+  data.tar.gz: eac0e2ca7376e065d96d43c81cafc54931f77386f2b8b2c00d1a69f7ca0f4b93
 SHA512:
-  metadata.gz: d91e3f678a7a3d53e94c607b5b88d5a6e695e166a52fd9f5527c8988bd717c60debc292798c159da7356966baa4d26ad22d56a9b922582040e758c37ef26ea96
-  data.tar.gz: e335f698b2a3fe29b139e826fafada70b94fd239a0c2e0f2be762075c27bb73c8dab4c93a9581089214b07f9016af893cd0c70daf0fdc2db9c8b72f7ae848850
+  metadata.gz: 57c525e75aee988ee335c12415b6d0cea2490890a4ae83dbccc5a9e4b16d6589792aa9c9032ccfb38dd63a30cf9d8080ec87913afe31d577cf07baa7ef916497
+  data.tar.gz: 6dd5a81b7fab1497885c73b601459ab6a12245dff817a17fbba3d40c39bf38a45571ef8526a09a3800baeeabd7e148ceefd412d970b5bff19df8d59374b56d74

data/CHANGELOG.md

@@ -5,16 +5,13 @@ upgrade guides.
 
 User-visible changes worth mentioning.
 
-## main
+## 5.9.6
 
-- Please add here
+- Reject requests that present more than one client identity (e.g. an `Authorization: Basic` header for one client and a `client_id` parameter naming another) with an `invalid_request` error, instead of authenticating the first extracted identity and silently discarding the other one. A `client_id` sent alongside another authentication method keeps working when it identifies the same client (RFC 7521 §4.2). Like the RFC 6749 §2.3 check released in 5.9.5, this validation does not apply when `client_credentials` is configured with a callable extractor, since the credentials the remaining extractors would return are never evaluated — the `client_credentials` option documents that now.
 
 ## 5.9.5
 
-- [#1901] Reject requests that authenticate the client with more than one method (RFC 6749 §2.3) with an `invalid_request` error, instead of silently authenticating with the first method that matched and discarding the other credentials.
-
-## 5.9.4
-
+- Reject requests that authenticate the client with more than one method (RFC 6749 §2.3) with an `invalid_request` error, instead of silently authenticating with the first method that matched and discarding the other credentials.
 - [#1853] Fix `reuse_access_token` reusing a token that was created with `custom_access_token_attributes` values when the new request doesn't specify any custom attributes. Such requests now only match tokens without custom attributes.
 
 ## 5.9.3

data/lib/doorkeeper/config.rb

@@ -69,6 +69,10 @@ module Doorkeeper
       # falls back to the `:client_id` and `:client_secret` params from the
       # `params` object.
       #
+      # NOTE: a list that includes a callable extractor opts out of the RFC 6749
+      # §2.3 validation applied to the symbol extractors — see
+      # +Doorkeeper::OAuth::Client::Credentials.from_request+.
+      #
       # @param methods [Array] Define client credentials
       def client_credentials(*methods)
         @config.instance_variable_set(:@client_credentials_methods, methods)

data/lib/doorkeeper/oauth/client/credentials.rb

@@ -10,15 +10,21 @@ module Doorkeeper
           # credentials wins, as it always has.
           #
           # Raises Errors::MultipleClientAuthMethods when the request
-          # authenticates the client with more than one method, which RFC 6749
-          # §2.3 forbids ("The client MUST NOT use more than one authentication
-          # method in each request").
+          # authenticates the client with more than one method, or presents
+          # more than one client identity, which RFC 6749 §2.3 forbids ("The
+          # client MUST NOT use more than one authentication method in each
+          # request").
           def from_request(request, *credentials_methods)
             # Callable extractors are opaque: they may legitimately overlap the
             # built-in methods they are configured with, and evaluating all of
             # them would also break the existing contract that the extractors
             # after the matching one are not called. Such configurations keep
-            # the historical behaviour untouched.
+            # the historical behaviour untouched, including the fact that a
+            # request authenticating with more than one method, or presenting
+            # more than one client identity, resolves to the first extracted
+            # credentials instead of being rejected: the extractor that would
+            # have surfaced the second identity is never evaluated. The
+            # +client_credentials+ configuration option documents this.
             return first_from_request(request, credentials_methods) unless credentials_methods.all?(Symbol)
 
             credentials = credentials_methods.filter_map { |method| extract(request, method) }
@@ -31,6 +37,15 @@ module Doorkeeper
             # method.
             raise Errors::MultipleClientAuthMethods if credentials.count { |c| c.secret.present? } > 1
 
+            # §4.2 allows that bare client_id because it identifies the *same*
+            # client as the authentication method it accompanies. Credentials
+            # naming two different clients are two client identities in one
+            # request and authenticate neither: without this check the first
+            # extracted uid would win and the other identity would be silently
+            # discarded, so the caller could authenticate as one client while
+            # the request asks to act as another.
+            raise Errors::MultipleClientAuthMethods if credentials.uniq(&:uid).size > 1
+
             credentials.first
           end
 

data/lib/doorkeeper/version.rb

@@ -5,7 +5,7 @@ module Doorkeeper
     # Semantic versioning
     MAJOR = 5
     MINOR = 9
-    TINY = 5
+    TINY = 6
     PRE = nil
 
     # Full version number

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -283,6 +283,14 @@ Doorkeeper.configure do
   # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
   # for more information on customization
   #
+  # NOTE: configuring a callable extractor opts the request out of the RFC 6749
+  # §2.3 checks that reject a request authenticating the client with more than
+  # one method, or presenting more than one client identity. A callable may
+  # legitimately overlap the built-in extractors, and the extractors after the
+  # matching one are never called, so what they would have returned is unknown.
+  # Prefer the symbol extractors unless you need something they cannot express;
+  # a callable has to reject such a request itself.
+  #
   # client_credentials :from_basic, :from_params
 
   # Change the way access token is authenticated from the request object.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.9.5
+  version: 5.9.6
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-08-07 00:00:00.000000000 Z
+date: 2026-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -261,7 +261,6 @@ files:
 - lib/doorkeeper/oauth/pre_authorization.rb
 - lib/doorkeeper/oauth/refresh_token_request.rb
 - lib/doorkeeper/oauth/scopes.rb
-- lib/doorkeeper/oauth/stateless_token.rb
 - lib/doorkeeper/oauth/token.rb
 - lib/doorkeeper/oauth/token_introspection.rb
 - lib/doorkeeper/oauth/token_request.rb

data/lib/doorkeeper/oauth/stateless_token.rb

@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-module Doorkeeper
-  module OAuth
-    # In-memory representation of a verified JWT access token. Returned by
-    # OAuth::Token.authenticate when stateless_jwt_tokens is enabled, so that
-    # the existing doorkeeper_token / doorkeeper_authorize! helpers work
-    # without any database read.
-    #
-    # Stateless tokens cannot be revoked or refreshed server-side: #revoked?
-    # is always false and #revoke is a no-op. Rely on short token lifetimes
-    # (access_token_expires_in) for early invalidation.
-    class StatelessToken
-      attr_reader :claims, :application, :raw_token
-
-      def initialize(claims:, application: nil, raw_token: nil)
-        @claims = claims
-        @application = application
-        @raw_token = raw_token
-      end
-
-      def token_type
-        "Bearer"
-      end
-
-      # The raw token string. Used by introspection's
-      # authorized_token_matches_introspected? security check.
-      def token
-        @raw_token
-      end
-
-      # Issuance path: the freshly-signed JWT returned to the client.
-      def plaintext_token
-        @raw_token
-      end
-
-      def plaintext_refresh_token
-        nil
-      end
-
-      def resource_owner_id
-        claims["resource_owner_id"] || claims["sub"]
-      end
-
-      def application_id
-        application&.id
-      end
-
-      def scopes_string
-        claims["scope"].to_s
-      end
-
-      def scopes
-        OAuth::Scopes.from_string(scopes_string)
-      end
-
-      def includes_scope?(*required_scopes)
-        required_scopes.blank? || required_scopes.any? { |scope| scopes.exists?(scope.to_s) }
-      end
-
-      def custom_attributes
-        claims.slice(*Doorkeeper.config.custom_access_token_attributes.map(&:to_s))
-      end
-
-      # RFC 8707 resource indicator. Stored as a space-delimited string to
-      # match the AccessToken column shape consumed by token_introspection.
-      def resource
-        aud = claims["aud"]
-        return nil if aud.blank?
-
-        aud.is_a?(Array) ? aud.join(" ") : aud.to_s
-      end
-
-      def created_at
-        Time.at(claims["iat"].to_i).utc
-      end
-
-      def expires_in
-        claims["expires_in"]
-      end
-
-      def expires_at
-        return nil unless claims["exp"]
-
-        Time.at(claims["exp"].to_i).utc
-      end
-
-      def expires_in_seconds
-        return nil unless expires_at
-
-        expires = expires_at - Time.now.utc
-        sec = expires.seconds.round(0)
-        sec > 0 ? sec : 0
-      end
-
-      def expired?
-        return false unless expires_at
-
-        Time.now.utc > expires_at
-      end
-
-      def revoked?
-        false
-      end
-
-      def accessible?
-        !expired? && !revoked?
-      end
-
-      def acceptable?(required_scopes)
-        accessible? && includes_scope?(*required_scopes)
-      end
-
-      def revoke_previous_refresh_token!
-        # no-op: stateless tokens carry no refresh-token chain to revoke.
-      end
-
-      def revoke
-        # no-op: stateless tokens cannot be revoked server-side.
-      end
-
-      def revocable?
-        false
-      end
-
-      def as_json(_options = {})
-        {
-          resource_owner_id: resource_owner_id,
-          scope: scopes,
-          expires_in: expires_in_seconds,
-          application: { uid: application.try(:uid) },
-          created_at: created_at.to_i,
-        }.tap do |json|
-          json[:resource_owner_type] = claims["resource_owner_type"] if Doorkeeper.configuration.polymorphic_resource_owner?
-        end
-      end
-    end
-  end
-end