Merge pull request #22 from fbelzunc/JENKINS-33213-v2

[FIXED JENKINS-33213] TimeLimitExceededException produces "Automatic" group lookup strategy not to work correctly
jenkinsci · Mar 1, 2016 · 663ae60 · 663ae60
2 parents 0c908ff + 26ebb1a
commit 663ae60
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectoryUnixAuthenticationProvider.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectoryUnixAuthenticationProvider.java
@@ -45,6 +45,7 @@
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
+import javax.naming.TimeLimitExceededException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -442,6 +443,8 @@ private Set<GrantedAuthority> resolveGroups(String domainDN, String userDN, DirC
                     try {
                         found = chainGroupLookup(domainDN, userDN, context, groups);
                         duration = TimeUnit2.NANOSECONDS.toSeconds(System.nanoTime() - start);
+                    } catch (TimeLimitExceededException e) {
+                        LOGGER.log(Level.WARNING, "The LDAP request did not terminate within the specified time limit. AD will fall back to recursive lookup", e);
                     } catch (NamingException e) {
                         if (e.getMessage().contains("LDAP response read timed out")) {
                             LOGGER.log(Level.WARNING, "LDAP response read time out. AD will fall back to recursive lookup", e);