Skip to content

[JENKINS-70272] Revert Test button to work on mode (TLS/nonTLS mode ) saved in the descriptor #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fbelzunc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[JENKINS-70272] Revert Test button to work on mode (TLS/nonTLS mode ) saved in the descriptor #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
884ef94
[JENKINS-70272] Revert Test button to work on mode (TLS/nonTLS mode …
fbelzunc Feb 27, 2023
37f300c
[JENKINS-69683] Revert back previous tests
fbelzunc Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/hudson/plugins/active_directory/ActiveDirectoryDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ActiveDirectoryDomain> 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());
Expand Down Expand Up @@ -314,7 +314,7 @@ public FormValidation doValidateTest(@QueryParameter(fixEmpty = true) String nam
DirContext ictx = DNSUtils.createDNSLookupContext();
List<SocketInfo> 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);
Expand All @@ -325,7 +325,7 @@ public FormValidation doValidateTest(@QueryParameter(fixEmpty = true) String nam
// Make sure the bind actually works
try {
Hashtable<String, String> 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)");
Expand Down
26 changes: 4 additions & 22 deletions src/test/java/hudson/plugins/active_directory/docker/TheFlintstonesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

}