Merge pull request #29 from fbelzunc/JENKINS-34143

[FIXED JENKINS-34143] Test Active Directory connection button reports success if the search operation doesn't have any result
jenkinsci · Apr 12, 2016 · 8a86022 · 8a86022
2 parents 313942c + a9be808
commit 8a86022
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java
@@ -389,7 +389,10 @@ public FormValidation doValidate(@QueryParameter(fixEmpty = true) String domain,
                             DirContext context = bind(bindName, Secret.toString(password), servers);
                             try {
                                 // actually do a search to make sure the credential is valid
-                                new LDAPSearchBuilder(context, toDC(name)).searchOne("(objectClass=user)");
+                                Attributes userAttributes = new LDAPSearchBuilder(context, toDC(name)).searchOne("(objectClass=user)");
+                                if (userAttributes == null) {
+                                    return FormValidation.error(Messages.ActiveDirectorySecurityRealm_NoUsers());
+                                }
                             } finally {
                                 context.close();
                             }

diff --git a/src/main/resources/hudson/plugins/active_directory/Messages.properties b/src/main/resources/hudson/plugins/active_directory/Messages.properties
@@ -3,3 +3,5 @@ DisplayName=Active Directory
 GroupLookupStrategy.Auto=Automatic
 GroupLookupStrategy.Recursive=Recursive group queries
 GroupLookupStrategy.ChainMatch=LDAP_MATCHING_RULE_IN_CHAIN
+
+ActiveDirectorySecurityRealm.NoUsers=The bind with the managerDn was successful but AD was not able to find any user.