diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectoryDomain.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectoryDomain.java index fafb27a4..0bd550aa 100644 --- a/src/main/java/hudson/plugins/active_directory/ActiveDirectoryDomain.java +++ b/src/main/java/hudson/plugins/active_directory/ActiveDirectoryDomain.java @@ -268,14 +268,14 @@ public ListBoxModel doFillTlsConfigurationItems() { @RequirePOST public FormValidation doValidateTest(@QueryParameter(fixEmpty = true) String name, @QueryParameter(fixEmpty = true) String servers, @QueryParameter(fixEmpty = true) String site, @QueryParameter(fixEmpty = true) String bindName, - @QueryParameter(fixEmpty = true) String bindPassword, @QueryParameter(fixEmpty = true) TlsConfiguration tlsConfiguration, @QueryParameter(fixEmpty = true) boolean requireTLS) throws IOException, ServletException, NamingException { + @QueryParameter(fixEmpty = true) String bindPassword, @QueryParameter(fixEmpty = true) TlsConfiguration tlsConfiguration) throws IOException, ServletException, NamingException { Jenkins.get().checkPermission(Jenkins.ADMINISTER); ActiveDirectoryDomain domain = new ActiveDirectoryDomain(name, servers, site, bindName, bindPassword, tlsConfiguration); List domains = new ArrayList<>(1); domains.add(domain); ActiveDirectorySecurityRealm activeDirectorySecurityRealm = new ActiveDirectorySecurityRealm(null, domains, site, bindName, - bindPassword, null, GroupLookupStrategy.AUTO, false, true, null, false, (ActiveDirectoryInternalUsersDatabase) null, requireTLS); + bindPassword, null, GroupLookupStrategy.AUTO, false, true, null, false, (ActiveDirectoryInternalUsersDatabase) null); ClassLoader ccl = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); @@ -314,7 +314,7 @@ public FormValidation doValidateTest(@QueryParameter(fixEmpty = true) String nam DirContext ictx = DNSUtils.createDNSLookupContext(); List obtainerServers; try { - obtainerServers = activeDirectorySecurityRealm.getDescriptor().obtainLDAPServer(ictx, name, site, servers, requireTLS); + obtainerServers = activeDirectorySecurityRealm.getDescriptor().obtainLDAPServer(ictx, name, site, servers); } catch (NamingException e) { String msg = site == null ? "No LDAP server was found in " + name : "No LDAP server was found in the " + site + " site of " + name; LOGGER.log(Level.WARNING, msg, e); @@ -325,7 +325,7 @@ public FormValidation doValidateTest(@QueryParameter(fixEmpty = true) String nam // Make sure the bind actually works try { Hashtable props = new Hashtable<>(0); - DirContext context = activeDirectorySecurityRealm.getDescriptor().bind(bindName, Secret.toString(password), obtainerServers, props, tlsConfiguration, requireTLS); + DirContext context = activeDirectorySecurityRealm.getDescriptor().bind(bindName, Secret.toString(password), obtainerServers, props, tlsConfiguration); try { // Actually do a search to make sure the credential is valid Attributes userAttributes = new LDAPSearchBuilder(context, toDC(name)).subTreeScope().searchOne("(objectClass=user)"); diff --git a/src/test/java/hudson/plugins/active_directory/docker/TheFlintstonesIT.java b/src/test/java/hudson/plugins/active_directory/docker/TheFlintstonesIT.java index 26c9eaac..bbbaaa3a 100644 --- a/src/test/java/hudson/plugins/active_directory/docker/TheFlintstonesIT.java +++ b/src/test/java/hudson/plugins/active_directory/docker/TheFlintstonesIT.java @@ -94,35 +94,17 @@ public void dynamicSetUp() throws Exception { @Issue("JENKINS-36148") @Test - public void validateCustomDomainController() throws ServletException, NamingException, IOException, Exception { + public void validateCustomDomainController() throws Exception { dynamicSetUp(); ActiveDirectoryDomain.DescriptorImpl adDescriptor = new ActiveDirectoryDomain.DescriptorImpl(); - assertEquals("OK: Success", adDescriptor.doValidateTest(AD_DOMAIN, dockerIp + ":" + dockerPort, null, AD_MANAGER_DN, AD_MANAGER_DN_PASSWORD, null, false).toString().trim()); + assertEquals("OK: Success", adDescriptor.doValidateTest(AD_DOMAIN, dockerIp + ":" + dockerPort, null, AD_MANAGER_DN, AD_MANAGER_DN_PASSWORD, null).toString().trim()); } @Issue("JENKINS-36148") @Test - public void validateDomain() throws ServletException, NamingException, IOException, Exception { + public void validateDomain() throws Exception { dynamicSetUp(); ActiveDirectoryDomain.DescriptorImpl adDescriptor = new ActiveDirectoryDomain.DescriptorImpl(); - assertEquals("OK: Success", adDescriptor.doValidateTest(AD_DOMAIN, null, null, AD_MANAGER_DN, AD_MANAGER_DN_PASSWORD, null, false).toString().trim()); - - } - - @Issue("JENKINS-69683") - @Test - public void validateTestDomainRequireTLSDisabled() throws Exception { - dynamicSetUp(); - ActiveDirectoryDomain.DescriptorImpl adDescriptor = new ActiveDirectoryDomain.DescriptorImpl(); - assertEquals("OK: Success", adDescriptor.doValidateTest(AD_DOMAIN, null, null, AD_MANAGER_DN, AD_MANAGER_DN_PASSWORD, null, false).toString().trim()); + assertEquals("OK: Success", adDescriptor.doValidateTest(AD_DOMAIN, null, null, AD_MANAGER_DN, AD_MANAGER_DN_PASSWORD, null).toString().trim()); } - - @Issue("JENKINS-69683") - @Test - public void validateTestDomainServerRequireTLSDisabled() throws Exception { - dynamicSetUp(); - ActiveDirectoryDomain.DescriptorImpl adDescriptor = new ActiveDirectoryDomain.DescriptorImpl(); - assertEquals("OK: Success", adDescriptor.doValidateTest(AD_DOMAIN, dockerIp + ":" + dockerPort, null, AD_MANAGER_DN, AD_MANAGER_DN_PASSWORD, null, false).toString().trim()); - } - }