Merge pull request #24245 from geoand/#24242

Add connect and read timeout config to elytron ldap extension
quarkusio · Mar 10, 2022 · b62e798 · b62e798
2 parents d3da73b + aa7ca62
commit b62e798
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/...on-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/LdapRecorder.java b/...on-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/LdapRecorder.java
@@ -54,7 +54,9 @@ private ExceptionSupplier<DirContext, NamingException> createDirContextSupplier(
         DirContextFactory dirContextFactory = new QuarkusDirContextFactory(
                 dirContext.url,
                 dirContext.principal.orElse(null),
-                dirContext.password.orElse(null));
+                dirContext.password.orElse(null),
+                dirContext.connectTimeout,
+                dirContext.readTimeout);
         return () -> dirContextFactory.obtainDirContext(dirContext.referralMode);
     }
 

diff --git a/...ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/QuarkusDirContextFactory.java b/...ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/QuarkusDirContextFactory.java
@@ -2,6 +2,7 @@
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.time.Duration;
 import java.util.Hashtable;
 
 import javax.naming.NamingException;
@@ -24,18 +25,20 @@ public class QuarkusDirContextFactory implements DirContextFactory {
     public static final String INITIAL_CONTEXT_FACTORY = "com.sun.jndi.ldap.LdapCtxFactory";
     private static final String SECURITY_AUTHENTICATION = "simple";
 
-    private static final String DEFAULT_CONNECT_TIMEOUT = "5000"; // ms
-    private static final String DEFAULT_READ_TIMEOUT = "60000"; // ms
-
     private final String providerUrl;
     private final String securityPrincipal;
     private final String securityCredential;
+    private final Duration connectTimeout;
+    private final Duration readTimeout;
     private final ClassLoader targetClassLoader;
 
-    public QuarkusDirContextFactory(String providerUrl, String securityPrincipal, String securityCredential) {
+    public QuarkusDirContextFactory(String providerUrl, String securityPrincipal, String securityCredential,
+            Duration connectTimeout, Duration readTimeout) {
         this.providerUrl = providerUrl;
         this.securityPrincipal = securityPrincipal;
         this.securityCredential = securityCredential;
+        this.connectTimeout = connectTimeout;
+        this.readTimeout = readTimeout;
         this.targetClassLoader = getClass().getClassLoader();
     }
 
@@ -93,8 +96,8 @@ private DirContext createDirContext(String securityPrincipal, char[] securityCre
                 env.put(InitialDirContext.SECURITY_CREDENTIALS, securityCredential);
             }
             env.put(InitialDirContext.REFERRAL, mode == null ? ReferralMode.IGNORE.getValue() : mode.getValue());
-            env.put(CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT);
-            env.put(READ_TIMEOUT, DEFAULT_READ_TIMEOUT);
+            env.put(CONNECT_TIMEOUT, "" + connectTimeout.toMillis());
+            env.put(READ_TIMEOUT, "" + readTimeout.toMillis());
 
             //            if (log.isDebugEnabled()) {
             //                log.debugf("Creating [" + InitialDirContext.class + "] with environment:");

diff --git a/...-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/DirContextConfig.java b/...-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/DirContextConfig.java
@@ -1,5 +1,6 @@
 package io.quarkus.elytron.security.ldap.config;
 
+import java.time.Duration;
 import java.util.Optional;
 
 import org.wildfly.security.auth.realm.ldap.DirContextFactory;
@@ -34,13 +35,27 @@ public class DirContextConfig {
     @ConfigItem(defaultValue = "ignore")
     public DirContextFactory.ReferralMode referralMode;
 
+    /**
+     * The connect timeout
+     */
+    @ConfigItem(defaultValue = "5s")
+    public Duration connectTimeout;
+
+    /**
+     * The read timeout
+     */
+    @ConfigItem(defaultValue = "60s")
+    public Duration readTimeout;
+
     @Override
     public String toString() {
         return "DirContextConfig{" +
                 "url='" + url + '\'' +
                 ", principal=" + principal +
                 ", password=" + password +
                 ", referralMode=" + referralMode +
+                ", connectTimeout=" + connectTimeout +
+                ", readTimeout=" + readTimeout +
                 '}';
     }
 }