Fix #824 - Introduce a separated OIDC module to hold security depende…

…ncies (#872) (#874) * Fix #824 - Introduce a separated OIDC module to hold security dependencies * Fix parent module --------- Signed-off-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Co-authored-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
quarkiverse · Dec 2, 2024 · 4ed0502 · 4ed0502
1 parent 111db2a
commit 4ed0502
Show file tree

Hide file tree

Showing 21 changed files with 249 additions and 230 deletions.
diff --git a/client/deployment/pom.xml b/client/deployment/pom.xml
@@ -36,6 +36,11 @@
       <artifactId>quarkus-openapi-generator</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.openapi.generator</groupId>
+      <artifactId>quarkus-openapi-generator-oidc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <!-- Forces swagger-parser version to avoid conflict with Quarkus.
     This is needed while org.openapitools:openapi-generator doesn't use swagger-parser 2.1.13 or greater -->
     <dependency>

diff --git a/...loyment/src/main/java/io/quarkiverse/openapi/generator/deployment/GeneratorProcessor.java b/...loyment/src/main/java/io/quarkiverse/openapi/generator/deployment/GeneratorProcessor.java
diff --git a/...a/io/quarkiverse/openapi/generator/deployment/authentication/OpenApiSpecProviderTest.java b/...a/io/quarkiverse/openapi/generator/deployment/authentication/OpenApiSpecProviderTest.java
@@ -17,11 +17,11 @@
 import io.quarkiverse.openapi.generator.markers.ApiKeyAuthenticationMarker;
 import io.quarkiverse.openapi.generator.markers.BasicAuthenticationMarker;
 import io.quarkiverse.openapi.generator.markers.OauthAuthenticationMarker;
+import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider;
 import io.quarkiverse.openapi.generator.providers.ApiKeyAuthenticationProvider;
 import io.quarkiverse.openapi.generator.providers.AuthProvider;
 import io.quarkiverse.openapi.generator.providers.BasicAuthenticationProvider;
 import io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider;
-import io.quarkiverse.openapi.generator.providers.OAuth2AuthenticationProvider;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class OpenApiSpecProviderTest {

diff --git a/client/integration-tests/enum-unexpected/pom.xml b/client/integration-tests/enum-unexpected/pom.xml
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>quarkus-openapi-generator-it-enum-unexpected</artifactId>
-  <name>Quarkus - Openapi Generator - Integration Tests - Enum Unexpected</name>
+  <name>Quarkus - Openapi Generator - Integration Tests - Client - Enum Unexpected</name>
   <description>Example project for OpenAPI with enum unexpected value</description>
 
   <dependencies>

diff --git a/client/integration-tests/polymorphism/pom.xml b/client/integration-tests/polymorphism/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-openapi-generator-it-polymorphism</artifactId>
-    <name>Quarkus - Openapi Generator - Integration Tests - Polymorphism</name>
+    <name>Quarkus - Openapi Generator - Integration Tests - Client - Polymorphism</name>
 
     <dependencies>
         <dependency>

diff --git a/client/integration-tests/pom.xml b/client/integration-tests/pom.xml
@@ -56,6 +56,11 @@
         <artifactId>quarkus-openapi-generator-it-generation-input</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.quarkiverse.openapi.generator</groupId>
+        <artifactId>quarkus-openapi-generator-oidc</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>
@@ -69,14 +74,6 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-resteasy-client-jackson</artifactId>
         </dependency>
-        <dependency>
-          <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-resteasy-multipart</artifactId>
-        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -104,10 +101,6 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-rest-client-jackson</artifactId>
         </dependency>
-        <dependency>
-          <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-rest-client-oidc-filter</artifactId>
-        </dependency>
         <dependency>
           <groupId>jakarta.validation</groupId>
           <artifactId>jakarta.validation-api</artifactId>

diff --git a/client/integration-tests/security/pom.xml b/client/integration-tests/security/pom.xml
@@ -16,6 +16,10 @@
       <groupId>io.quarkiverse.openapi.generator</groupId>
       <artifactId>quarkus-openapi-generator</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.openapi.generator</groupId>
+      <artifactId>quarkus-openapi-generator-oidc</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
@@ -91,5 +95,30 @@
         <quarkus.package.type>native</quarkus.package.type>
       </properties>
     </profile>
+    <profile>
+      <id>resteasy-reactive</id>
+      <dependencies>
+        <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-rest-client-oidc-filter</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>resteasy-classic</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-resteasy-multipart</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/...va/io/quarkiverse/openapi/generator/it/security/TokenPropagationExternalServicesMock.java b/...va/io/quarkiverse/openapi/generator/it/security/TokenPropagationExternalServicesMock.java
@@ -14,6 +14,9 @@
 
 import jakarta.ws.rs.core.HttpHeaders;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.tomakehurst.wiremock.WireMockServer;
 
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
@@ -25,18 +28,25 @@ public class TokenPropagationExternalServicesMock implements QuarkusTestResource
     public static final String SERVICE3_AUTHORIZATION_TOKEN = "SERVICE3_AUTHORIZATION_TOKEN";
     public static final String SERVICE4_HEADER_TO_PROPAGATE = "SERVICE4_HEADER_TO_PROPAGATE";
     public static final String SERVICE4_AUTHORIZATION_TOKEN = "SERVICE4_AUTHORIZATION_TOKEN";
-
-    private static final String BEARER = "Bearer ";
-
     public static final String TOKEN_PROPAGATION_EXTERNAL_SERVICE_MOCK_URL = "propagation-external-service-mock.url";
-
+    private static final String BEARER = "Bearer ";
+    private static final Logger LOGGER = LoggerFactory.getLogger(TokenPropagationExternalServicesMock.class);
     private WireMockServer wireMockServer;
 
+    private static void stubForExternalService(String tokenPropagationExternalServiceUrl, String authorizationToken) {
+        stubFor(post(tokenPropagationExternalServiceUrl)
+                .withHeader(HttpHeaders.AUTHORIZATION, equalTo(BEARER + authorizationToken))
+                .willReturn(aResponse()
+                        .withHeader(CONTENT_TYPE, APPLICATION_JSON)
+                        .withBody("{}")));
+    }
+
     @Override
     public Map<String, String> start() {
         wireMockServer = new WireMockServer(options().dynamicPort());
         wireMockServer.start();
         configureFor(wireMockServer.port());
+        LOGGER.info("Mocked Server started at {}", wireMockServer.baseUrl());
 
         // stub the token-propagation-external-service1 invocation with the expected token
         stubForExternalService("/token-propagation-external-service1/executeQuery1", AUTHORIZATION_TOKEN);
@@ -58,14 +68,6 @@ public Map<String, String> start() {
         return Map.of(TOKEN_PROPAGATION_EXTERNAL_SERVICE_MOCK_URL, wireMockServer.baseUrl());
     }
 
-    private static void stubForExternalService(String tokenPropagationExternalServiceUrl, String authorizationToken) {
-        stubFor(post(tokenPropagationExternalServiceUrl)
-                .withHeader(HttpHeaders.AUTHORIZATION, equalTo(BEARER + authorizationToken))
-                .willReturn(aResponse()
-                        .withHeader(CONTENT_TYPE, APPLICATION_JSON)
-                        .withBody("{}")));
-    }
-
     @Override
     public void stop() {
         if (wireMockServer != null) {

diff --git a/client/integration-tests/without-oidc/pom.xml b/client/integration-tests/without-oidc/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>quarkus-openapi-generator-parent</artifactId>
+    <artifactId>quarkus-openapi-generator-integration-tests</artifactId>
     <groupId>io.quarkiverse.openapi.generator</groupId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-jackson</artifactId>
+      <artifactId>quarkus-hibernate-validator</artifactId>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>

diff --git a/client/integration-tests/without-oidc/src/main/resources/application.properties b/client/integration-tests/without-oidc/src/main/resources/application.properties
@@ -1,3 +1 @@
 quarkus.rest-client.quarkus_simple_openapi_yaml.url=http://localhost:8080
-
-quarkus.keycloak.devservices.enabled=false
diff --git a/client/oidc/pom.xml b/client/oidc/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkiverse.openapi.generator</groupId>
+        <artifactId>quarkus-openapi-generator-client-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-openapi-generator-oidc</artifactId>
+    <name>Quarkus - Openapi Generator - Client - OIDC</name>
+    <description>OIDC Capabilities for Runtime</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkiverse.openapi.generator</groupId>
+            <artifactId>quarkus-openapi-generator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-oidc-filter</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...assicOidcClientRequestFilterDelegate.java → ...assicOidcClientRequestFilterDelegate.java b/...assicOidcClientRequestFilterDelegate.java → ...assicOidcClientRequestFilterDelegate.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.openapi.generator;
+package io.quarkiverse.openapi.generator.oidc;
 
 import java.io.IOException;
 
@@ -10,7 +10,9 @@
 
 import org.jboss.logging.Logger;
 
-import io.quarkiverse.openapi.generator.providers.OAuth2AuthenticationProvider;
+import io.quarkiverse.openapi.generator.OidcClient;
+import io.quarkiverse.openapi.generator.OpenApiGeneratorConfig;
+import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider;
 import io.quarkus.oidc.client.runtime.AbstractTokensProducer;
 import io.quarkus.oidc.client.runtime.DisabledOidcClientException;
 
@@ -19,15 +21,13 @@
 public class ClassicOidcClientRequestFilterDelegate extends AbstractTokensProducer
         implements ClientRequestFilter, OAuth2AuthenticationProvider.OidcClientRequestFilterDelegate {
 
-    private static final Logger LOG = Logger
-            .getLogger(ClassicOidcClientRequestFilterDelegate.class);
+    private static final Logger LOG = Logger.getLogger(ClassicOidcClientRequestFilterDelegate.class);
 
     final String clientId;
 
     ClassicOidcClientRequestFilterDelegate(InjectionPoint injectionPoint) {
         OidcClient annotation = (OidcClient) injectionPoint.getQualifiers().stream()
-                .filter(x -> x.annotationType().equals(OidcClient.class))
-                .findFirst().orElseThrow();
+                .filter(x -> x.annotationType().equals(OidcClient.class)).findFirst().orElseThrow();
 
         this.clientId = OpenApiGeneratorConfig.getSanitizedSecuritySchemeName(annotation.name());
     }

diff --git a/.../oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/OidcAuthenticationRecorder.java b/.../oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/OidcAuthenticationRecorder.java
@@ -0,0 +1,33 @@
+package io.quarkiverse.openapi.generator.oidc;
+
+import java.util.List;
+import java.util.function.Function;
+
+import io.quarkiverse.openapi.generator.AuthenticationRecorder;
+import io.quarkiverse.openapi.generator.OidcClient;
+import io.quarkiverse.openapi.generator.OpenApiGeneratorConfig;
+import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider;
+import io.quarkiverse.openapi.generator.providers.AuthProvider;
+import io.quarkiverse.openapi.generator.providers.OperationAuthInfo;
+import io.quarkus.arc.SyntheticCreationalContext;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class OidcAuthenticationRecorder {
+    private final OpenApiGeneratorConfig generatorConfig;
+
+    public OidcAuthenticationRecorder(OpenApiGeneratorConfig generatorConfig) {
+        this.generatorConfig = generatorConfig;
+    }
+
+    public Function<SyntheticCreationalContext<AuthProvider>, AuthProvider> recordOauthAuthProvider(
+            String name,
+            String openApiSpecId,
+            List<OperationAuthInfo> operations) {
+        return context -> new OAuth2AuthenticationProvider(
+                AuthenticationRecorder.getAuthConfig(generatorConfig, openApiSpecId, name), name, openApiSpecId,
+                context.getInjectedReference(OAuth2AuthenticationProvider.OidcClientRequestFilterDelegate.class,
+                        new OidcClient.Literal(name)),
+                operations);
+    }
+}
diff --git a/...ctiveOidcClientRequestFilterDelegate.java → ...ctiveOidcClientRequestFilterDelegate.java b/...ctiveOidcClientRequestFilterDelegate.java → ...ctiveOidcClientRequestFilterDelegate.java
@@ -1,7 +1,6 @@
-package io.quarkiverse.openapi.generator;
+package io.quarkiverse.openapi.generator.oidc;
 
 import java.io.IOException;
-import java.util.function.Consumer;
 
 import jakarta.annotation.Priority;
 import jakarta.enterprise.inject.spi.InjectionPoint;
@@ -13,8 +12,9 @@
 import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext;
 import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter;
 
-import io.quarkiverse.openapi.generator.providers.OAuth2AuthenticationProvider;
-import io.quarkus.oidc.client.Tokens;
+import io.quarkiverse.openapi.generator.OidcClient;
+import io.quarkiverse.openapi.generator.OpenApiGeneratorConfig;
+import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider;
 import io.quarkus.oidc.client.runtime.AbstractTokensProducer;
 import io.quarkus.oidc.client.runtime.DisabledOidcClientException;
 import io.quarkus.oidc.common.runtime.OidcConstants;
@@ -24,16 +24,14 @@
 public class ReactiveOidcClientRequestFilterDelegate extends AbstractTokensProducer
         implements ResteasyReactiveClientRequestFilter, OAuth2AuthenticationProvider.OidcClientRequestFilterDelegate {
 
-    private static final Logger LOG = Logger
-            .getLogger(ReactiveOidcClientRequestFilterDelegate.class);
+    private static final Logger LOG = Logger.getLogger(ReactiveOidcClientRequestFilterDelegate.class);
     private static final String BEARER_SCHEME_WITH_SPACE = OidcConstants.BEARER_SCHEME + " ";
 
     final String clientId;
 
     ReactiveOidcClientRequestFilterDelegate(InjectionPoint injectionPoint) {
         OidcClient annotation = (OidcClient) injectionPoint.getQualifiers().stream()
-                .filter(x -> x.annotationType().equals(OidcClient.class))
-                .findFirst().orElseThrow();
+                .filter(x -> x.annotationType().equals(OidcClient.class)).findFirst().orElseThrow();
         this.clientId = OpenApiGeneratorConfig.getSanitizedSecuritySchemeName(annotation.name());
     }
 
@@ -58,23 +56,17 @@ public void filter(ClientRequestContext requestContext) throws IOException {
     public void filter(ResteasyReactiveClientRequestContext requestContext) {
         requestContext.suspend();
 
-        super.getTokens().subscribe().with(new Consumer<>() {
-            @Override
-            public void accept(Tokens tokens) {
-                requestContext.getHeaders().putSingle(HttpHeaders.AUTHORIZATION,
-                        BEARER_SCHEME_WITH_SPACE + tokens.getAccessToken());
+        super.getTokens().subscribe().with(tokens -> {
+            requestContext.getHeaders().putSingle(HttpHeaders.AUTHORIZATION,
+                    BEARER_SCHEME_WITH_SPACE + tokens.getAccessToken());
+            requestContext.resume();
+        }, t -> {
+            if (t instanceof DisabledOidcClientException) {
+                LOG.debug("Client is disabled, acquiring and propagating the token is not necessary");
                 requestContext.resume();
-            }
-        }, new Consumer<>() {
-            @Override
-            public void accept(Throwable t) {
-                if (t instanceof DisabledOidcClientException) {
-                    LOG.debug("Client is disabled, acquiring and propagating the token is not necessary");
-                    requestContext.resume();
-                } else {
-                    LOG.debugf("Access token is not available, cause: %s, aborting the request", t.getMessage());
-                    requestContext.resume((t instanceof RuntimeException) ? t : new RuntimeException(t));
-                }
+            } else {
+                LOG.debugf("Access token is not available, cause: %s, aborting the request", t.getMessage());
+                requestContext.resume((t instanceof RuntimeException) ? t : new RuntimeException(t));
             }
         });
     }

diff --git a/...oviders/OAuth2AuthenticationProvider.java → ...oviders/OAuth2AuthenticationProvider.java b/...oviders/OAuth2AuthenticationProvider.java → ...oviders/OAuth2AuthenticationProvider.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.openapi.generator.providers;
+package io.quarkiverse.openapi.generator.oidc.providers;
 
 import static io.quarkiverse.openapi.generator.AuthConfig.TOKEN_PROPAGATION;
 
@@ -12,6 +12,8 @@
 import org.slf4j.LoggerFactory;
 
 import io.quarkiverse.openapi.generator.AuthConfig;
+import io.quarkiverse.openapi.generator.providers.AbstractAuthProvider;
+import io.quarkiverse.openapi.generator.providers.OperationAuthInfo;
 import io.quarkus.oidc.common.runtime.OidcConstants;
 
 public class OAuth2AuthenticationProvider extends AbstractAuthProvider {
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		quarkus.rest-client.quarkus_simple_openapi_yaml.url=http://localhost:8080

		quarkus.keycloak.devservices.enabled=false