Fixing the condition for remote TLS and username/password (keycloak#2…

…8950) Closes keycloak#28949 Signed-off-by: Alexander Schwartz <[email protected]>
miquelsi · Apr 22, 2024 · 5ae1712 · 5ae1712
1 parent b553fc2
commit 5ae1712
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java b/.../main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java
@@ -6,7 +6,7 @@
 import io.smallrye.config.ConfigSourceInterceptorContext;
 
 import static java.util.Optional.of;
-import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalValue;
+import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue;
 import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption;
 
 import java.io.File;
@@ -79,7 +79,7 @@ public static PropertyMapper<?>[] getClusteringPropertyMappers() {
     }
 
     private static boolean remoteHostSet() {
-        return getOptionalValue(CachingOptions.CACHE_REMOTE_HOST_PROPERTY).isPresent();
+        return getOptionalKcValue(CachingOptions.CACHE_REMOTE_HOST_PROPERTY).isPresent();
     }
 
     private static Optional<String> resolveConfigFile(Optional<String> value, ConfigSourceInterceptorContext context) {

diff --git a/...main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java b/...main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java
@@ -147,8 +147,8 @@ private static boolean isRemoteTLSEnabled() {
     }
 
     private static boolean isRemoteAuthenticationEnabled() {
-        return Configuration.getOptionalValue(CACHE_REMOTE_USERNAME_PROPERTY).isPresent() ||
-                Configuration.getOptionalValue(CACHE_REMOTE_PASSWORD_PROPERTY).isPresent();
+        return Configuration.getOptionalKcValue(CACHE_REMOTE_USERNAME_PROPERTY).isPresent() ||
+                Configuration.getOptionalKcValue(CACHE_REMOTE_PASSWORD_PROPERTY).isPresent();
     }
 
     private static SSLContext createSSLContext() {