Skip to content

OpenID Connect: Respect the configured flow types if the server sends none #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

OpenID Connect: Respect the configured flow types if the server sends none #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5da03e
OpenID Connect: Honor supported grant types unless the server decides…
Traderjoe95 Sep 4, 2025
17abd35
empty commit to retrigger ECA validation
Traderjoe95 Sep 4, 2025
65617ab
Tests for changed grant type handling
Traderjoe95 Sep 5, 2025
ed48141
Alternative solution: Intersection of supported grant types
Traderjoe95 Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion vertx-auth-oauth2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@
<vertx.surefire.useModulePath>false</vertx.surefire.useModulePath>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.21.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.vertx</groupId>
Expand All @@ -50,9 +62,18 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mockserver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-client-java</artifactId>
<version>5.15.0</version>
</dependency>
</dependencies>

<profiles>
Expand Down
44 changes: 37 additions & 7 deletions vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/OpenIDConnectAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@
import io.vertx.core.Future;
import io.vertx.core.Vertx;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.auth.JWTOptions;
import io.vertx.ext.auth.impl.http.SimpleHttpClient;
import io.vertx.ext.auth.oauth2.OAuth2Auth;
import io.vertx.ext.auth.oauth2.OAuth2Options;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
* Simplified factory to create an {@link io.vertx.ext.auth.oauth2.OAuth2Auth} for OpenID Connect.
*
Expand Down Expand Up @@ -134,14 +139,39 @@ static Future<OAuth2Auth> discover(final Vertx vertx, final OAuth2Options config
jwtOptions.setIssuer(json.getString("issuer"));
}


// reset config
config.setSupportedGrantTypes(null);

if (json.containsKey("grant_types_supported")) {
// optional config
JsonArray flows = json.getJsonArray("grant_types_supported");
flows.forEach(el -> config.addSupportedGrantType((String) el));
List<String> configuredGrantTypes = config.getSupportedGrantTypes();
final Set<String> configured = configuredGrantTypes == null ? null : new HashSet<>(configuredGrantTypes);

// reset config
config.setSupportedGrantTypes(null);

Stream<String> supportedGrantTypes = json.getJsonArray("grant_types_supported")
.stream()
.map(el -> (String) el);

// If the caller configured supported grant types, use the intersection with the server-supported grant types.
// Otherwise, use all grant types that the server supports.
if (configured != null) {
supportedGrantTypes = supportedGrantTypes.filter(configured::contains);
}

supportedGrantTypes
.forEach(config::addSupportedGrantType);

// If the supported grant types are still null here, either the server sent an empty list of supported grant
// types or the intersection with the configured grant types was empty. Both cases are errors.
if (config.getSupportedGrantTypes() == null) {
return Future.failedFuture(
"No supported grant types with this authorization provider. Supported: " +
json.getJsonArray("grant_types_supported").stream()
.map(el -> (String) el)
.collect(Collectors.joining(", ", "[", "]")) +
". Configured: " +
(configuredGrantTypes == null ? "<any>" : configuredGrantTypes.stream().collect(Collectors.joining(", ", "[", "]")))
);
}
}

try {
Expand Down
Loading