Check self-signed ID token when access token is verified

(cherry picked from commit d8ff7e4)

extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java

@@ -137,19 +137,8 @@ public Uni<SecurityIdentity> apply(UserInfo userInfo, Throwable t) {
                 return validateTokenWithUserInfoAndCreateIdentity(requestData, request, resolvedContext, null);
             }
         } else {
-            final Uni<TokenVerificationResult> primaryTokenUni;
-            if (isInternalIdToken(request)) {
-                if (requestData.get(NEW_AUTHENTICATION) == Boolean.TRUE) {
-                    // No need to verify it in this case as 'CodeAuthenticationMechanism' has just created it
-                    primaryTokenUni = Uni.createFrom()
-                            .item(new TokenVerificationResult(OidcUtils.decodeJwtContent(request.getToken().getToken()), null));
-                } else {
-                    primaryTokenUni = verifySelfSignedTokenUni(resolvedContext, request.getToken().getToken());
-                }
-            } else {
-                primaryTokenUni = verifyTokenUni(requestData, resolvedContext, request.getToken(),
-                        isIdToken(request), null);
-            }
+            final Uni<TokenVerificationResult> primaryTokenUni = verifyPrimaryTokenUni(requestData, request, resolvedContext,
+                    null);
 
             return getUserInfoAndCreateIdentity(primaryTokenUni, requestData, request, resolvedContext);
         }
@@ -174,11 +163,10 @@ public Uni<SecurityIdentity> apply(TokenVerificationResult codeAccessToken, Thro
                             requestData.put(OidcUtils.CODE_ACCESS_TOKEN_RESULT, codeAccessToken);
                         }
 
-                        Uni<TokenVerificationResult> tokenUni = verifyTokenUni(requestData, resolvedContext,
-                                request.getToken(),
-                                false, userInfo);
+                        Uni<TokenVerificationResult> primaryTokenUni = verifyPrimaryTokenUni(requestData, request,
+                                resolvedContext, userInfo);
 
-                        return tokenUni.onItemOrFailure()
+                        return primaryTokenUni.onItemOrFailure()
                                 .transformToUni(
                                         new BiFunction<TokenVerificationResult, Throwable, Uni<? extends SecurityIdentity>>() {
                                             @Override
@@ -196,6 +184,22 @@ public Uni<SecurityIdentity> apply(TokenVerificationResult result, Throwable t)
                 });
     }
 
+    private Uni<TokenVerificationResult> verifyPrimaryTokenUni(Map<String, Object> requestData,
+            TokenAuthenticationRequest request, TenantConfigContext resolvedContext, UserInfo userInfo) {
+        if (isInternalIdToken(request)) {
+            if (requestData.get(NEW_AUTHENTICATION) == Boolean.TRUE) {
+                // No need to verify it in this case as 'CodeAuthenticationMechanism' has just created it
+                return Uni.createFrom()
+                        .item(new TokenVerificationResult(OidcUtils.decodeJwtContent(request.getToken().getToken()), null));
+            } else {
+                return verifySelfSignedTokenUni(resolvedContext, request.getToken().getToken());
+            }
+        } else {
+            return verifyTokenUni(requestData, resolvedContext, request.getToken(),
+                    isIdToken(request), userInfo);
+        }
+    }
+
     private Uni<SecurityIdentity> getUserInfoAndCreateIdentity(Uni<TokenVerificationResult> tokenUni,
             Map<String, Object> requestData,
             TokenAuthenticationRequest request,

integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowOpaqueAccessTokenResource.java

@@ -0,0 +1,33 @@
+package io.quarkus.it.keycloak;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.quarkus.oidc.AccessTokenCredential;
+import io.quarkus.security.Authenticated;
+
+@Path("/code-flow-opaque-access-token")
+@Authenticated
+public class CodeFlowOpaqueAccessTokenResource {
+
+    @Inject
+    JsonWebToken jwtAccessToken;
+
+    @Inject
+    AccessTokenCredential accessTokenCredential;
+
+    @GET
+    public String getAccessTokenCredential() {
+        return accessTokenCredential.getToken();
+    }
+
+    @GET
+    @Path("/jwt-access-token")
+    public String getJwtAccessToken() {
+        return jwtAccessToken.getRawToken();
+    }
+
+}

integration-tests/oidc-wiremock/src/main/resources/application.properties

@@ -36,6 +36,15 @@ quarkus.oidc.code-flow-verify-id-and-access-tokens.credentials.secret=secret
 quarkus.oidc.code-flow-verify-id-and-access-tokens.application-type=web-app
 quarkus.oidc.code-flow-verify-id-and-access-tokens.token.audience=any
 
+quarkus.oidc.code-flow-opaque-access-token.provider=github
+quarkus.oidc.code-flow-opaque-access-token.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.code-flow-opaque-access-token.authorization-path=/
+quarkus.oidc.code-flow-opaque-access-token.token-path=${keycloak.url}/realms/quarkus/opaque-access-token
+quarkus.oidc.code-flow-opaque-access-token.user-info-path=protocol/openid-connect/userinfo
+quarkus.oidc.code-flow-opaque-access-token.client-id=quarkus-web-app
+quarkus.oidc.code-flow-opaque-access-token.credentials.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
+quarkus.oidc.code-flow-opaque-access-token.tenant-paths=/code-flow-opaque-access-token/*
+
 quarkus.oidc.code-flow-encrypted-id-token-jwk.auth-server-url=${keycloak.url}/realms/quarkus/
 quarkus.oidc.code-flow-encrypted-id-token-jwk.client-id=quarkus-web-app
 quarkus.oidc.code-flow-encrypted-id-token-jwk.credentials.secret=secret

integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java

@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -35,6 +36,7 @@
 
 import org.awaitility.core.ThrowingRunnable;
 import org.hamcrest.Matchers;
+import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.SilentCssErrorHandler;
 import org.htmlunit.TextPage;
 import org.htmlunit.WebClient;
@@ -107,6 +109,33 @@ public void testCodeFlow() throws IOException {
         clearCache();
     }
 
+    @Test
+    public void testCodeFlowOpaqueAccessToken() throws IOException {
+        defineCodeFlowOpaqueAccessTokenStub();
+        try (final WebClient webClient = createWebClient()) {
+            webClient.getOptions().setRedirectEnabled(true);
+            HtmlPage page = webClient.getPage("http://localhost:8081/code-flow-opaque-access-token");
+
+            HtmlForm form = page.getFormByName("form");
+            form.getInputByName("username").type("alice");
+            form.getInputByName("password").type("alice");
+
+            TextPage textPage = form.getInputByValue("login").click();
+
+            assertEquals("alice", textPage.getContent());
+
+            try {
+                webClient.getPage("http://localhost:8081/code-flow-opaque-access-token/jwt-access-token");
+                fail("500 status error is expected");
+            } catch (FailingHttpStatusCodeException ex) {
+                assertEquals(500, ex.getStatusCode());
+            }
+
+            webClient.getCookieManager().clearCookies();
+        }
+        clearCache();
+    }
+
     @Test
     public void testCodeFlowVerifyIdAndAccessToken() throws IOException {
         defineCodeFlowLogoutStub();
@@ -627,6 +656,16 @@ private void defineCodeFlowUserInfoCachedInIdTokenStub() {
 
     }
 
+    private void defineCodeFlowOpaqueAccessTokenStub() {
+        wireMockServer
+                .stubFor(WireMock.post(urlPathMatching("/auth/realms/quarkus/opaque-access-token"))
+                        .willReturn(WireMock.aResponse()
+                                .withHeader("Content-Type", "application/json")
+                                .withBody("{\n" +
+                                        "  \"access_token\": \"alice\","
+                                        + "\"expires_in\": 299}")));
+    }
+
     private void defineCodeFlowTokenIntrospectionStub() {
         wireMockServer
                 .stubFor(WireMock.post("/auth/realms/quarkus/access_token")