Skip to content

Commit

Permalink
BZ-1110206 - LDAPUserGroupCallbackImpl and LDAPUserInfoImpl do not su…
Browse files Browse the repository at this point in the history 
…pport SUB_TREE search scope

(cherry picked from commit dd2b435)
  • Loading branch information
@mswiderski
mswiderski committed Jul 22, 2014
1 parent ace41e4 commit ba38dcb
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 3 deletions.
32 changes: 31 additions & 1 deletion ...an-task-core/src/main/java/org/jbpm/services/task/identity/LDAPUserGroupCallbackImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
* <li>ldap.user.attr.id (optional, if not given 'uid' will be used)</li>
* <li>ldap.roles.attr.id (optional, if not given 'cn' will be used)</li>
* <li>ldap.user.id.dn (optional, is user id a DN, instructs the callback to query for user DN before searching for roles, default false)</li>
* <li>ldap.search.scope (optional, if not given 'OBJECT_SCOPE' will be used) possible values are: OBJECT_SCOPE, ONELEVEL_SCOPE, SUBTREE_SCOPE</li>
* <li>java.naming.factory.initial</li>
* <li>java.naming.security.authentication</li>
* <li>java.naming.security.protocol</li>
Expand All @@ -73,6 +74,7 @@ public class LDAPUserGroupCallbackImpl extends AbstractUserGroupInfo implements
public static final String USER_ATTR_ID = "ldap.user.attr.id";
public static final String ROLE_ATTR_ID = "ldap.roles.attr.id";
public static final String IS_USER_ID_DN = "ldap.user.id.dn";
public static final String SEARCH_SCOPE = "ldap.search.scope";

protected static final String[] requiredProperties = {USER_CTX, ROLE_CTX, USER_FILTER, ROLE_FILTER, USER_ROLES_FILTER};

Expand Down Expand Up @@ -108,6 +110,10 @@ public boolean existsUser(String userId) {
logger.debug("Seaching for user existence with filter {} on context {}", userFilter, userContext);

SearchControls constraints = new SearchControls();
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

NamingEnumeration<SearchResult> result = ctx.search(userContext, userFilter, constraints);
if (result.hasMore()) {
Expand Down Expand Up @@ -153,6 +159,10 @@ public boolean existsGroup(String groupId) {
roleFilter = roleFilter.replaceAll("\\{0\\}", groupId);

SearchControls constraints = new SearchControls();
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

NamingEnumeration<SearchResult> result = ctx.search(roleContext, roleFilter, constraints);
if (result.hasMore()) {
Expand Down Expand Up @@ -200,6 +210,10 @@ public List<String> getGroupsForUser(String userId, List<String> groupIds,

userFilter = userFilter.replaceAll("\\{0\\}", userId);
SearchControls constraints = new SearchControls();
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

logger.debug("Searching for user DN with filter {} on context {}", userFilter, userContext);

Expand All @@ -219,7 +233,12 @@ public List<String> getGroupsForUser(String userId, List<String> groupIds,

roleFilter = roleFilter.replaceAll("\\{0\\}", (userDN != null ? userDN : userId));
SearchControls constraints = new SearchControls();
logger.debug("Searching for groups for user with filter {} on context {}", roleFilter, roleContext);
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

logger.debug("Searching for groups for user with filter {} on context {}", roleFilter, roleContext);

NamingEnumeration<SearchResult> result = ctx.search(roleContext, roleFilter, constraints);
if (result.hasMore()) {
Expand Down Expand Up @@ -323,5 +342,16 @@ protected InitialLdapContext buildInitialLdapContext() throws NamingException {
return new InitialLdapContext(this.config, null);
}

protected int parseSearchScope(String searchScope) {
logger.debug("Search scope: {}", searchScope);
if ("OBJECT_SCOPE".equals(searchScope))
return 0;
else if ("ONELEVEL_SCOPE".equals(searchScope))
return 1;
else if ("SUBTREE_SCOPE".equals(searchScope))
return 2;

// Default set to OBJECT_SCOPE
return 0;
}
}
27 changes: 25 additions & 2 deletions .../jbpm-human-task-core/src/main/java/org/jbpm/services/task/identity/LDAPUserInfoImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package org.jbpm.services.task.identity;

import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
Expand Down Expand Up @@ -63,6 +61,7 @@ public class LDAPUserInfoImpl extends AbstractUserGroupInfo implements UserInfo
public static final String ROLE_ATTR_ID = "ldap.role.attr.id";

public static final String IS_ENTITY_ID_DN = "ldap.entity.id.dn";
public static final String SEARCH_SCOPE = "ldap.search.scope";

protected static final String[] requiredProperties = {USER_CTX, ROLE_CTX, USER_FILTER, ROLE_FILTER};

Expand Down Expand Up @@ -115,6 +114,10 @@ public Iterator<OrganizationalEntity> getMembersForGroup(Group group) {
roleFilter = roleFilter.replaceAll("\\{0\\}", group.getId());

SearchControls constraints = new SearchControls();
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

NamingEnumeration<SearchResult> result = ctx.search(roleContext, roleFilter, constraints);
while (result.hasMore()) {
Expand Down Expand Up @@ -157,6 +160,10 @@ public boolean hasEmail(Group group) {
roleFilter = roleFilter.replaceAll("\\{0\\}", group.getId());

SearchControls constraints = new SearchControls();
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

NamingEnumeration<SearchResult> result = ctx.search(roleContext, roleFilter, constraints);
if (result.hasMore()) {
Expand Down Expand Up @@ -313,6 +320,10 @@ protected String searchLdap(String context, String filter, String attrId, Organi
filter = filter.replaceAll("\\{0\\}",entityId);

SearchControls constraints = new SearchControls();
String searchScope = this.config.getProperty(SEARCH_SCOPE);
if (searchScope != null) {
constraints.setSearchScope(parseSearchScope(searchScope));
}

NamingEnumeration<SearchResult> ldapResult = ctx.search(context, filter, constraints);
if (ldapResult.hasMore()) {
Expand Down Expand Up @@ -363,5 +374,17 @@ protected String extractUserId(String userDN, OrganizationalEntity entity) {
}
return null;
}

protected int parseSearchScope(String searchScope) {
logger.debug("Search scope: {}", searchScope);
if ("OBJECT_SCOPE".equals(searchScope))
return 0;
else if ("ONELEVEL_SCOPE".equals(searchScope))
return 1;
else if ("SUBTREE_SCOPE".equals(searchScope))
return 2;

// Default set to OBJECT_SCOPE
return 0;
}
}

0 comments on commit ba38dcb

Please sign in to comment.