Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-44743] Dumb down userSearchBase normalization a bit
Apparently the current rootDn suffixing is not as smart as I was
  • Loading branch information
rsandell committed Jun 20, 2017
1 parent 905d177 commit 3d4ae83
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
Expand Up @@ -528,9 +528,6 @@ private static String normalizeUserSearchBase(String rootDN, String userSearchBa
}
rootDN = rootDN.trim();
userSearchBase = userSearchBase.trim();
if (userSearchBase.endsWith(rootDN)) {
return userSearchBase;
}
return userSearchBase + "," + rootDN;
}

Expand Down
Expand Up @@ -155,20 +155,18 @@ public void generateIdJustOneServer() {

@Test
public void generateIdWithNormalizedUserSearchBase() {
String id1 = LDAPConfiguration.generateId("ldap.example.com", "dc=example,dc=com", "dc=users,dc=example,dc=com", null);
String id2 = LDAPConfiguration.generateId("ldap.example.com", "dc=example,dc=com", "dc=users", null);
String id3 = LDAPConfiguration.generateId("ldap.example.com", "dc=com", "dc=users,dc=example", null);
String id4 = LDAPConfiguration.generateId("ldap.example.com", null, "dc=users,dc=example,dc=com", null);
String id5 = LDAPConfiguration.generateId("ldap.example.com", "", "dc=users,dc=example,dc=com", null);
String id6 = LDAPConfiguration.generateId("ldap.example.com", "dc=users,dc=example,dc=com", "", null);
String id7 = LDAPConfiguration.generateId("ldap.example.com", "dc=users,dc=example,dc=com", null, null);
String id1 = LDAPConfiguration.generateId("ldap.example.com", "dc=example,dc=com", "dc=users", null);
String id2 = LDAPConfiguration.generateId("ldap.example.com", "dc=com", "dc=users,dc=example", null);
String id3 = LDAPConfiguration.generateId("ldap.example.com", null, "dc=users,dc=example,dc=com", null);
String id4 = LDAPConfiguration.generateId("ldap.example.com", "", "dc=users,dc=example,dc=com", null);
String id5 = LDAPConfiguration.generateId("ldap.example.com", "dc=users,dc=example,dc=com", "", null);
String id6 = LDAPConfiguration.generateId("ldap.example.com", "dc=users,dc=example,dc=com", null, null);

assertEquals(id1, id2);
assertEquals(id1, id3);
assertEquals(id1, id4);
assertEquals(id1, id5);
assertEquals(id1, id6);
assertEquals(id1, id7);

id1 = LDAPConfiguration.generateId("ldap.example.com", "dc=example,dc=com", "dc=users", null);
id2 = LDAPConfiguration.generateId("ldap.example.com", "dc=example,dc=com", "dc=expats", null);
Expand Down

0 comments on commit 3d4ae83

Please sign in to comment.