Support token propagation during identity augmentation

extensions/oidc-token-propagation-reactive/deployment/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveBuildStep.java

@@ -10,15 +10,19 @@
 import org.jboss.jandex.Type;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
 import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.oidc.token.propagation.AccessToken;
 import io.quarkus.rest.client.reactive.deployment.DotNames;
 import io.quarkus.rest.client.reactive.deployment.RegisterProviderAnnotationInstanceBuildItem;
+import io.quarkus.runtime.configuration.ConfigurationException;
 
 @BuildSteps(onlyIf = OidcTokenPropagationReactiveBuildStep.IsEnabled.class)
 public class OidcTokenPropagationReactiveBuildStep {
@@ -51,11 +55,36 @@ void registerProvider(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
 
     }
 
+    @BuildStep(onlyIf = IsEnabledDuringAuth.class)
+    SystemPropertyBuildItem activateTokenCredentialPropagationViaDuplicatedContext(Capabilities capabilities) {
+        if (capabilities.isPresent(Capability.OIDC)) {
+            return new SystemPropertyBuildItem("quarkus.oidc.propagate-token-credential-with-duplicated-context", "true");
+        }
+
+        if (capabilities.isPresent(Capability.JWT)) {
+            return new SystemPropertyBuildItem("quarkus.smallrye-jwt.propagate-token-credential-with-duplicated-context",
+                    "true");
+        }
+
+        throw new ConfigurationException(
+                "Configuration property 'quarkus.oidc-token-propagation-reactive.enabled-during-authentication' is set to " +
+                        "'true', however this configuration property is only supported when either 'quarkus-oidc' or " +
+                        "'quarkus-smallrye-jwt' extensions are present.");
+    }
+
     public static class IsEnabled implements BooleanSupplier {
         OidcTokenPropagationReactiveBuildTimeConfig config;
 
         public boolean getAsBoolean() {
             return config.enabled;
         }
     }
+
+    public static class IsEnabledDuringAuth implements BooleanSupplier {
+        OidcTokenPropagationReactiveBuildTimeConfig config;
+
+        public boolean getAsBoolean() {
+            return config.enabledDuringAuthentication;
+        }
+    }
 }

extensions/oidc-token-propagation-reactive/deployment/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveBuildTimeConfig.java

@@ -13,4 +13,18 @@ public class OidcTokenPropagationReactiveBuildTimeConfig {
      */
     @ConfigItem(defaultValue = "true")
     public boolean enabled;
+
+    /**
+     * Whether the token propagation is enabled during the `SecurityIdentity` augmentation.
+     *
+     * For example, you may need to use a REST client from `SecurityIdentityAugmentor`
+     * to propagate the current token to acquire additional roles for the `SecurityIdentity`.
+     *
+     * Note, this feature rely on a duplicated context. More information about Vert.x duplicated
+     * context can be found in xref:duplicated-context[this guide].
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean enabledDuringAuthentication;
 }

extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/FrontendResource.java

@@ -8,6 +8,8 @@
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
+import io.quarkus.security.identity.CurrentIdentityAssociation;
+
 @Path("/frontend")
 public class FrontendResource {
     @Inject
@@ -17,10 +19,24 @@ public class FrontendResource {
     @Inject
     JsonWebToken jwt;
 
+    @Inject
+    CurrentIdentityAssociation identityAssociation;
+
     @GET
     @Path("token-propagation")
     @RolesAllowed("admin")
     public String userNameTokenPropagation() {
+        return getResponseWithExchangedUsername();
+    }
+
+    @GET
+    @Path("token-propagation-with-augmentor")
+    @RolesAllowed("tester") // tester role is granted by SecurityIdentityAugmentor
+    public String userNameTokenPropagationWithSecIdentityAugmentor() {
+        return getResponseWithExchangedUsername();
+    }
+
+    private String getResponseWithExchangedUsername() {
         if ("alice".equals(jwt.getName())) {
             return "Token issued to " + jwt.getName() + " has been exchanged, new user name: "
                     + accessTokenPropagationService.getUserName();

extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationWithSecurityIdentityAugmentorLazyAuthTest.java

@@ -0,0 +1,55 @@
+package io.quarkus.oidc.token.propagation.reactive;
+
+import static io.quarkus.oidc.token.propagation.reactive.RolesSecurityIdentityAugmentor.SUPPORTED_USER;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.Set;
+
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.oidc.server.OidcWiremockTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(OidcWiremockTestResource.class)
+public class OidcTokenPropagationWithSecurityIdentityAugmentorLazyAuthTest {
+
+    private static Class<?>[] testClasses = {
+            FrontendResource.class,
+            ProtectedResource.class,
+            AccessTokenPropagationService.class,
+            RolesResource.class,
+            RolesService.class,
+            RolesSecurityIdentityAugmentor.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(testClasses)
+                    .addAsResource("application.properties")
+                    .addAsResource(
+                            new StringAsset("quarkus.oidc-token-propagation-reactive.enabled-during-authentication=true\n" +
+                                    "quarkus.rest-client.\"roles\".uri=http://localhost:8081/roles\n" +
+                                    "quarkus.http.auth.proactive=false\n"),
+                            "META-INF/microprofile-config.properties"));
+
+    @Test
+    public void testGetUserNameWithTokenPropagation() {
+        // request only succeeds if SecurityIdentityAugmentor managed to acquire 'tester' role for user 'alice'
+        // and that is only possible if access token is propagated during augmentation
+        RestAssured.given().auth().oauth2(getBearerAccessToken())
+                .when().get("/frontend/token-propagation-with-augmentor")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Token issued to alice has been exchanged, new user name: bob"));
+    }
+
+    public String getBearerAccessToken() {
+        return OidcWiremockTestResource.getAccessToken(SUPPORTED_USER, Set.of("admin"));
+    }
+
+}

extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationWithSecurityIdentityAugmentorTest.java

@@ -0,0 +1,54 @@
+package io.quarkus.oidc.token.propagation.reactive;
+
+import static io.quarkus.oidc.token.propagation.reactive.RolesSecurityIdentityAugmentor.SUPPORTED_USER;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.Set;
+
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.oidc.server.OidcWiremockTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(OidcWiremockTestResource.class)
+public class OidcTokenPropagationWithSecurityIdentityAugmentorTest {
+
+    private static Class<?>[] testClasses = {
+            FrontendResource.class,
+            ProtectedResource.class,
+            AccessTokenPropagationService.class,
+            RolesResource.class,
+            RolesService.class,
+            RolesSecurityIdentityAugmentor.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(testClasses)
+                    .addAsResource("application.properties")
+                    .addAsResource(
+                            new StringAsset("quarkus.oidc-token-propagation-reactive.enabled-during-authentication=true\n" +
+                                    "quarkus.rest-client.\"roles\".uri=http://localhost:8081/roles\n"),
+                            "META-INF/microprofile-config.properties"));
+
+    @Test
+    public void testGetUserNameWithTokenPropagation() {
+        // request only succeeds if SecurityIdentityAugmentor managed to acquire 'tester' role for user 'alice'
+        // and that is only possible if access token is propagated during augmentation
+        RestAssured.given().auth().oauth2(getBearerAccessToken())
+                .when().get("/frontend/token-propagation-with-augmentor")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Token issued to alice has been exchanged, new user name: bob"));
+    }
+
+    public String getBearerAccessToken() {
+        return OidcWiremockTestResource.getAccessToken(SUPPORTED_USER, Set.of("admin"));
+    }
+
+}

extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/RolesResource.java

@@ -0,0 +1,26 @@
+package io.quarkus.oidc.token.propagation.reactive;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.quarkus.security.Authenticated;
+import io.quarkus.security.ForbiddenException;
+
+@Path("/roles")
+@Authenticated
+public class RolesResource {
+
+    @Inject
+    JsonWebToken jwt;
+
+    @GET
+    public String get() {
+        if ("bob".equals(jwt.getName())) {
+            return "tester";
+        }
+        throw new ForbiddenException("Only user 'bob' is allowed to request roles");
+    }
+}

extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/RolesSecurityIdentityAugmentor.java

@@ -0,0 +1,34 @@
+package io.quarkus.oidc.token.propagation.reactive;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.identity.SecurityIdentityAugmentor;
+import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+import io.smallrye.mutiny.Uni;
+
+@ApplicationScoped
+public class RolesSecurityIdentityAugmentor implements SecurityIdentityAugmentor {
+
+    static final String SUPPORTED_USER = "alice";
+
+    @Inject
+    @RestClient
+    RolesService rolesService;
+
+    @Override
+    public Uni<SecurityIdentity> augment(SecurityIdentity securityIdentity,
+            AuthenticationRequestContext authenticationRequestContext) {
+        if (securityIdentity != null && securityIdentity.getPrincipal() != null
+                && SUPPORTED_USER.equals(securityIdentity.getPrincipal().getName())) {
+            return rolesService
+                    .getRole()
+                    .map(role -> QuarkusSecurityIdentity.builder(securityIdentity).addRole(role).build());
+        }
+        return Uni.createFrom().item(securityIdentity);
+    }
+}

extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/RolesService.java

@@ -0,0 +1,18 @@
+package io.quarkus.oidc.token.propagation.reactive;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.token.propagation.AccessToken;
+import io.smallrye.mutiny.Uni;
+
+@RegisterRestClient(configKey = "roles")
+@AccessToken
+@Path("/")
+public interface RolesService {
+
+    @GET
+    Uni<String> getRole();
+}

extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java

@@ -25,12 +25,15 @@
 import io.quarkus.oidc.client.runtime.DisabledOidcClientException;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.security.credential.TokenCredential;
+import io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle;
 import io.smallrye.mutiny.Uni;
+import io.vertx.core.Vertx;
 
 @Priority(Priorities.AUTHENTICATION)
 public class AccessTokenRequestReactiveFilter implements ResteasyReactiveClientRequestFilter {
     private static final Logger LOG = Logger.getLogger(AccessTokenRequestReactiveFilter.class);
     private static final String BEARER_SCHEME_WITH_SPACE = "Bearer ";
+    private static final String ERROR_MSG = "OIDC Token Propagation Reactive requires a safe (isolated) Vert.x sub-context because configuration property 'quarkus.oidc-token-propagation-reactive.enabled-during-authentication' has been set to true, but the current context hasn't been flagged as such.";
 
     @Inject
     Instance<TokenCredential> accessToken;
@@ -41,6 +44,9 @@ public class AccessTokenRequestReactiveFilter implements ResteasyReactiveClientR
     @Inject
     @ConfigProperty(name = "quarkus.oidc-token-propagation-reactive.exchange-token")
     boolean exchangeToken;
+    @Inject
+    @ConfigProperty(name = "quarkus.oidc-token-propagation-reactive.enabled-during-authentication", defaultValue = "false")
+    boolean enabledDuringAuthentication;
 
     OidcClient exchangeTokenClient;
     String exchangeTokenProperty;
@@ -73,7 +79,7 @@ public void filter(ResteasyReactiveClientRequestContext requestContext) {
 
                 requestContext.suspend();
 
-                exchangeToken(accessToken.get().getToken()).subscribe().with(new Consumer<>() {
+                exchangeToken(getAccessToken().getToken()).subscribe().with(new Consumer<>() {
                     @Override
                     public void accept(String token) {
                         propagateToken(requestContext, token);
@@ -94,7 +100,7 @@ public void accept(Throwable t) {
                     }
                 });
             } else {
-                propagateToken(requestContext, accessToken.get().getToken());
+                propagateToken(requestContext, getAccessToken().getToken());
             }
         } else {
             abortRequest(requestContext);
@@ -111,6 +117,19 @@ public void propagateToken(ResteasyReactiveClientRequestContext requestContext,
     }
 
     protected boolean verifyTokenInstance(ResteasyReactiveClientRequestContext requestContext) {
+        if (enabledDuringAuthentication) {
+            // TokenCredential cannot be accessed from CDI during authentication process
+            TokenCredential tokenCredential = getTokenCredentialFromContext();
+            if (tokenCredential != null) {
+                if (tokenCredential.getToken() == null) {
+                    LOG.debugf("Propagated access token is null, aborting the request with HTTP 401 error");
+                    return false;
+                }
+                // use propagated access token
+                return true;
+            }
+            // this means authentication is already done, therefore we use CDI
+        }
         if (!accessToken.isResolvable()) {
             LOG.debugf("Access token is not injected, aborting the request with HTTP 401 error");
             return false;
@@ -126,6 +145,22 @@ protected boolean verifyTokenInstance(ResteasyReactiveClientRequestContext reque
         return true;
     }
 
+    private TokenCredential getAccessToken() {
+        if (enabledDuringAuthentication) {
+            TokenCredential tokenCredential = getTokenCredentialFromContext();
+            if (tokenCredential != null) {
+                return tokenCredential;
+            }
+            // this means auth is already done, therefore let's use CDI
+        }
+        return accessToken.get();
+    }
+
+    private static TokenCredential getTokenCredentialFromContext() {
+        VertxContextSafetyToggle.validateContextIfExists(ERROR_MSG, ERROR_MSG);
+        return Vertx.currentContext().getLocal(TokenCredential.class.getName());
+    }
+
     private Uni<String> exchangeToken(String token) {
         return exchangeTokenClient.getTokens(Collections.singletonMap(exchangeTokenProperty, token))
                 .onItem().transform(t -> t.getAccessToken());