Merge pull request quarkusio#36445 from karesti/update-infinispan

Updates to Infinispan 14.0.19.Final
bartm-dvb · Oct 15, 2023 · 2265840 · 2265840
2 parents f0397be + 3e96055
commit 2265840
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -139,7 +139,7 @@
         <rest-assured.version>5.3.0</rest-assured.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
-        <infinispan.version>14.0.17.Final</infinispan.version>
+        <infinispan.version>14.0.19.Final</infinispan.version>
         <infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
         <caffeine.version>3.1.5</caffeine.version>
         <netty.version>4.1.100.Final</netty.version>

diff --git a/.../test/java/org/quarkus/infinispan/client/deployment/InfinispanConfigurationSetupTest.java b/.../test/java/org/quarkus/infinispan/client/deployment/InfinispanConfigurationSetupTest.java
@@ -43,6 +43,8 @@ public void infinispanConnectionConfiguration() {
         assertThat(configuration.security().ssl().provider()).isEqualTo("SSL_prov");
         assertThat(configuration.security().ssl().protocol()).isEqualTo("SSL_protocol");
         assertThat(configuration.security().ssl().ciphers()).containsExactlyInAnyOrder("SSL_cipher1", "SSL_cipher2");
+        assertThat(configuration.security().ssl().hostnameValidation()).isTrue();
+        assertThat(configuration.security().ssl().sniHostName()).isEqualTo("sniHostName");
         assertThat(configuration.clusters()).extracting("clusterName", "clientIntelligence")
                 .containsExactly(tuple("bsite", ClientIntelligence.BASIC));
         assertThat(configuration.clusters()).hasSize(1);

diff --git a/...sions/infinispan-client/deployment/src/test/resources/cache-config-application.properties b/...sions/infinispan-client/deployment/src/test/resources/cache-config-application.properties
@@ -16,6 +16,9 @@ quarkus.infinispan-client.trust-store-type=JCEKS
 quarkus.infinispan-client.ssl-provider=SSL_prov
 quarkus.infinispan-client.ssl-protocol=SSL_protocol
 quarkus.infinispan-client.ssl-ciphers=SSL_cipher1,SSL_cipher2
+quarkus.infinispan-client.ssl-host-name-validation=true
+quarkus.infinispan-client.sni-host-name=sniHostName
+
 quarkus.infinispan-client.backup-cluster.bsite.hosts=bsite1:32111
 quarkus.infinispan-client.backup-cluster.bsite.client-intelligence=BASIC
 

diff --git a/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
@@ -224,6 +224,15 @@ private ConfigurationBuilder builderFromProperties(String infinispanClientName,
                     infinispanClientRuntimeConfig.sslCiphers.get().stream().collect(Collectors.joining(" ")));
         }
 
+        if (infinispanClientRuntimeConfig.sslHostNameValidation.isPresent()) {
+            properties.put(ConfigurationProperties.SSL_HOSTNAME_VALIDATION,
+                    infinispanClientRuntimeConfig.sslHostNameValidation.get());
+        }
+
+        if (infinispanClientRuntimeConfig.sniHostName.isPresent()) {
+            properties.put(ConfigurationProperties.SNI_HOST_NAME, infinispanClientRuntimeConfig.sniHostName.get());
+        }
+
         builder.withProperties(properties);
 
         if (infinispanClientRuntimeConfig.tracingPropagationEnabled.isPresent()) {

diff --git a/...ime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java b/...ime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java
@@ -166,6 +166,19 @@ public class InfinispanClientRuntimeConfig {
     @ConfigItem
     Optional<List<String>> sslCiphers;
 
+    /**
+     * Do SSL hostname validation.
+     * Defaults to true.
+     */
+    @ConfigItem
+    Optional<Boolean> sslHostNameValidation;
+
+    /**
+     * SNI host name. Mandatory when SSL is enabled and host name validation is true.
+     */
+    @ConfigItem
+    Optional<String> sniHostName;
+
     /**
      * Whether a tracing propagation is enabled in case the Opentelemetry extension is present.
      * By default the propagation of the context is propagated from the client to the Infinispan Server.