Merge pull request #44 from fbelzunc/JENKINS-38295

JENKINS-38294 Add a warning when displayed name is not used with several domains
jenkinsci · Sep 16, 2016 · 50db0a0 · 50db0a0
2 parents 3163157 + c76d691
commit 50db0a0
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java
@@ -393,6 +393,15 @@ public ListBoxModel doFillGroupLookupStrategyItems() {
 
         public FormValidation doValidate(@QueryParameter(fixEmpty = true) String domain, @QueryParameter(fixEmpty = true) String site, @QueryParameter(fixEmpty = true) String bindName,
                 @QueryParameter(fixEmpty = true) String bindPassword, @QueryParameter(fixEmpty = true) String server) throws IOException, ServletException, NamingException {
+            String [] domains = domain.split(",");
+            String[] DnItems = {"CN=", "DC=", "OU="};
+            if (domains.length > 1 ) {
+                for (String dnItem : DnItems) {
+                    if (bindName.contains(dnItem)) {
+                        return FormValidation.error("Use multiple domains require the bindName to be expressed with the displayedName");
+                    }
+                }
+            }
             ClassLoader ccl = Thread.currentThread().getContextClassLoader();
             Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
             try {
@@ -503,6 +512,19 @@ public FormValidation doValidate(@QueryParameter(fixEmpty = true) String domain,
             }
         }
 
+        public FormValidation doCheckBindName(@QueryParameter String domain, @QueryParameter String bindName) {
+            String [] domains = domain.split(",");
+            String[] DnItems = {"CN=", "DC=", "OU="};
+            if (domains.length > 1 ) {
+                for (String dnItem : DnItems) {
+                    if (bindName.contains(dnItem)) {
+                        return FormValidation.warning("Please, use the displayedName");
+                    }
+                }
+            }
+            return FormValidation.ok();
+        }
+
         /**
          * Binds to the server using the specified username/password.
          * <p>