From 2645fb1045b7a5423eb09132b2f829066907c219 Mon Sep 17 00:00:00 2001
From: Pedro Igor <pigor.craveiro@gmail.com>
Date: Tue, 10 Dec 2024 22:39:07 -0300
Subject: [PATCH] Setting protocol when initializing the LDAP provider

Closes #35758

Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
---
 .../keycloak/storage/ldap/LDAPStorageProviderFactory.java    | 5 +++++
 .../main/java/org/keycloak/quarkus/runtime/KeycloakMain.java | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java
index b2cfbc6b177b..7c69e5cdfd62 100755
--- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java
+++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java
@@ -83,6 +83,7 @@ public class LDAPStorageProviderFactory implements UserStorageProviderFactory<LD
 
     private static final Logger logger = Logger.getLogger(LDAPStorageProviderFactory.class);
     public static final String PROVIDER_NAME = LDAPConstants.LDAP_PROVIDER;
+    private static final String LDAP_CONNECTION_POOL_PROTOCOL = "com.sun.jndi.ldap.connect.pool.protocol";
 
     private LDAPIdentityStoreRegistry ldapStoreRegistry;
 
@@ -313,6 +314,10 @@ public void validateConfiguration(KeycloakSession session, RealmModel realm, Com
 
     @Override
     public void init(Config.Scope config) {
+        // set connection pooling for plain and tls protocols by default
+        if (System.getProperty(LDAP_CONNECTION_POOL_PROTOCOL) == null) {
+            System.setProperty(LDAP_CONNECTION_POOL_PROTOCOL, "plain ssl");
+        }
         this.ldapStoreRegistry = new LDAPIdentityStoreRegistry();
     }
 
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java
index 95774395f229..76d301fd052b 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java
@@ -52,17 +52,12 @@
 public class KeycloakMain implements QuarkusApplication {
 
     private static final String INFINISPAN_VIRTUAL_THREADS_PROP = "org.infinispan.threads.virtual";
-    private static final String LDAP_CONNECTION_POOL_PROTOCOL = "com.sun.jndi.ldap.connect.pool.protocol";
 
     static {
         // enable Infinispan and JGroups virtual threads by default
         if (System.getProperty(INFINISPAN_VIRTUAL_THREADS_PROP) == null) {
             System.setProperty(INFINISPAN_VIRTUAL_THREADS_PROP, "true");
         }
-        // set connection pooling for plain and tls protocols by default
-        if (System.getProperty(LDAP_CONNECTION_POOL_PROTOCOL) == null) {
-            System.setProperty(LDAP_CONNECTION_POOL_PROTOCOL, "plain ssl");
-        }
     }
 
     public static void main(String[] args) {