Merge pull request #37226 from gsmet/3.5.3-backports-2

3.5.3 backports 2
quarkusio · Nov 21, 2023 · 74caaff · 74caaff
2 parents be5b75d + 85dcd00
commit 74caaff
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 13 deletions.
diff --git a/.../java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java b/.../java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java
@@ -25,6 +25,7 @@
 import io.quarkus.keycloak.admin.client.common.KeycloakAdminClientInjectionEnabled;
 import io.quarkus.keycloak.admin.client.reactive.runtime.ResteasyReactiveClientProvider;
 import io.quarkus.keycloak.admin.client.reactive.runtime.ResteasyReactiveKeycloakAdminClientRecorder;
+import io.quarkus.runtime.TlsConfig;
 
 public class KeycloakAdminClientReactiveProcessor {
 
@@ -53,8 +54,8 @@ public void nativeImage(BuildProducer<ServiceProviderBuildItem> serviceProviderP
     @Record(ExecutionTime.STATIC_INIT)
     @Produce(ServiceStartBuildItem.class)
     @BuildStep
-    public void integrate(ResteasyReactiveKeycloakAdminClientRecorder recorder) {
-        recorder.setClientProvider();
+    public void integrate(ResteasyReactiveKeycloakAdminClientRecorder recorder, TlsConfig tlsConfig) {
+        recorder.setClientProvider(tlsConfig.trustAll);
     }
 
     @Record(ExecutionTime.RUNTIME_INIT)

diff --git a/...ava/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java b/...ava/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java
@@ -30,9 +30,15 @@ public class ResteasyReactiveClientProvider implements ResteasyClientProvider {
     private static final List<String> HANDLED_MEDIA_TYPES = List.of(MediaType.APPLICATION_JSON);
     private static final int PROVIDER_PRIORITY = Priorities.USER + 100; // ensures that it will be used first
 
+    private final boolean tlsTrustAll;
+
+    public ResteasyReactiveClientProvider(boolean tlsTrustAll) {
+        this.tlsTrustAll = tlsTrustAll;
+    }
+
     @Override
     public Client newRestEasyClient(Object messageHandler, SSLContext sslContext, boolean disableTrustManager) {
-        ClientBuilderImpl clientBuilder = new ClientBuilderImpl().trustAll(disableTrustManager);
+        ClientBuilderImpl clientBuilder = new ClientBuilderImpl().trustAll(tlsTrustAll || disableTrustManager);
         return registerJacksonProviders(clientBuilder).build();
     }
 

diff --git a/...s/keycloak/admin/client/reactive/runtime/ResteasyReactiveKeycloakAdminClientRecorder.java b/...s/keycloak/admin/client/reactive/runtime/ResteasyReactiveKeycloakAdminClientRecorder.java
@@ -21,8 +21,8 @@ public ResteasyReactiveKeycloakAdminClientRecorder(
         this.keycloakAdminClientConfigRuntimeValue = keycloakAdminClientConfigRuntimeValue;
     }
 
-    public void setClientProvider() {
-        Keycloak.setClientProvider(new ResteasyReactiveClientProvider());
+    public void setClientProvider(boolean tlsTrustAll) {
+        Keycloak.setClientProvider(new ResteasyReactiveClientProvider(tlsTrustAll));
     }
 
     public Supplier<Keycloak> createAdminClient() {

diff --git a/...rc/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java b/...rc/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java
@@ -25,6 +25,7 @@
 import io.quarkus.keycloak.admin.client.common.AutoCloseableDestroyer;
 import io.quarkus.keycloak.admin.client.common.KeycloakAdminClientInjectionEnabled;
 import io.quarkus.keycloak.adminclient.ResteasyKeycloakAdminClientRecorder;
+import io.quarkus.runtime.TlsConfig;
 
 public class KeycloakAdminClientProcessor {
 
@@ -48,8 +49,8 @@ ReflectiveClassBuildItem reflect() {
     @Record(ExecutionTime.STATIC_INIT)
     @Produce(ServiceStartBuildItem.class)
     @BuildStep
-    public void integrate(ResteasyKeycloakAdminClientRecorder recorder) {
-        recorder.setClientProvider();
+    public void integrate(ResteasyKeycloakAdminClientRecorder recorder, TlsConfig tlsConfig) {
+        recorder.setClientProvider(tlsConfig.trustAll);
     }
 
     @Record(ExecutionTime.RUNTIME_INIT)

diff --git a/...me/src/main/java/io/quarkus/keycloak/adminclient/ResteasyKeycloakAdminClientRecorder.java b/...me/src/main/java/io/quarkus/keycloak/adminclient/ResteasyKeycloakAdminClientRecorder.java
@@ -58,13 +58,13 @@ public Keycloak get() {
         };
     }
 
-    public void setClientProvider() {
+    public void setClientProvider(boolean tlsTrustAll) {
         Keycloak.setClientProvider(new ResteasyClientClassicProvider() {
             @Override
             public Client newRestEasyClient(Object customJacksonProvider, SSLContext sslContext, boolean disableTrustManager) {
                 // point here is to use default Quarkus providers rather than org.keycloak.admin.client.JacksonProvider
                 // as it doesn't work properly in native mode
-                return ClientBuilderWrapper.create(sslContext, disableTrustManager).build();
+                return ClientBuilderWrapper.create(sslContext, tlsTrustAll || disableTrustManager).build();
             }
         });
     }

diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
@@ -420,6 +420,11 @@
                                         <ignore>maven.settings</ignore>
                                     </ignoredKeys>
                                 </systemProperties>
+                                <runtimeClassPath>
+                                    <ignoredFiles>
+                                        <ignoredFile>META-INF/ide-deps/**</ignoredFile>
+                                    </ignoredFiles>
+                                </runtimeClassPath>
                             </normalization>
                             <plugins>
                                 <plugin>
@@ -554,6 +559,8 @@
                                                     <exclude>.idea/*</exclude>
                                                     <exclude>target/*</exclude>
                                                     <exclude>.cache/*</exclude>
+                                                    <exclude>.factorypath</exclude>
+                                                    <exclude>*.log</exclude>
                                                 </excludes>
                                                 <normalization>
                                                     <ignoreEmptyDirectories>true</ignoreEmptyDirectories>

diff --git a/...e/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartFormDataOutput.java b/...e/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartFormDataOutput.java
@@ -1,7 +1,7 @@
 package org.jboss.resteasy.reactive.server.multipart;
 
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import jakarta.ws.rs.core.MediaType;
@@ -10,7 +10,7 @@
  * Used when a Resource method needs to return a multipart output
  */
 public final class MultipartFormDataOutput {
-    private final Map<String, PartItem> parts = new HashMap<>();
+    private final Map<String, PartItem> parts = new LinkedHashMap<>();
 
     public Map<String, PartItem> getFormData() {
         return Collections.unmodifiableMap(parts);

diff --git a/integration-tests/oidc-client-reactive/pom.xml b/integration-tests/oidc-client-reactive/pom.xml
@@ -156,6 +156,9 @@
                         <gradleEnterprise>
                             <normalization combine.children="append">
                                 <runtimeClassPath>
+                                    <ignoredFiles>
+                                        <ignoredFile>META-INF/ide-deps/**</ignoredFile>
+                                    </ignoredFiles>
                                     <propertiesNormalizations>
                                         <propertiesNormalization>
                                             <path>application.properties</path>

diff --git a/integration-tests/rest-client-reactive/pom.xml b/integration-tests/rest-client-reactive/pom.xml
@@ -156,6 +156,9 @@
                         <gradleEnterprise>
                             <normalization combine.children="append">
                                 <runtimeClassPath>
+                                    <ignoredFiles>
+                                        <ignoredFile>META-INF/ide-deps/**</ignoredFile>
+                                    </ignoredFiles>
                                     <propertiesNormalizations>
                                         <propertiesNormalization>
                                             <path>application.properties</path>

diff --git a/...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml b/...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
@@ -46,7 +46,7 @@
       <groupId>io.quarkus</groupId>
       <artifactId>integration-test-extension-that-defines-junit-test-extensions</artifactId>
       <version>${quarkus.version}</version>
-       <scope>test</scope> 
+       <scope>test</scope>
     </dependency>
 
   </dependencies>
@@ -109,7 +109,7 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <native.image.path>\${project.build.directory}/\${project.build.finalName}-runner</native.image.path>
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                     <maven.home>\${maven.home}</maven.home>
                   </systemPropertyVariables>