Skip to content

Commit

Permalink
Made changes to support cursor based pagination for LDAP and JDBC sin…
Browse files Browse the repository at this point in the history 
…gle and multiattribute identity claim filtering and multi attribute filtering with identity claims and default claims for LDAP
  • Loading branch information
@BojithaPiyathilake
BojithaPiyathilake committed May 23, 2022
1 parent a7c4f7b commit 17bbc5e
Show file tree
Hide file tree
Showing 7 changed files with 436 additions and 338 deletions.
4 changes: 4 additions & 0 deletions .../org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/UserCoreConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ public class UserCoreConstants {
public static final String USER_LOCKED = "true";
public static final String USER_UNLOCKED = "false";

// Properties used for cursor pagination
public static final String PREVIOUS = "prev";
public static final String NEXT = "next";

public static final class RealmConfig {
public static final String LOCAL_NAME_USER_MANAGER = "UserManager";
public static final String LOCAL_NAME_REALM = "Realm";
Expand Down
175 changes: 95 additions & 80 deletions ...on.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,32 +86,16 @@
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.sql.DataSource;

import static org.wso2.carbon.user.core.UserCoreConstants.*;
import static org.wso2.carbon.user.core.UserCoreConstants.ClaimTypeURIs.IDENTITY_CLAIM_URI;
import static org.wso2.carbon.user.core.UserCoreConstants.DOMAIN_SEPARATOR;
import static org.wso2.carbon.user.core.UserCoreConstants.INTERNAL_DOMAIN;
import static org.wso2.carbon.user.core.UserCoreConstants.INTERNAL_SYSTEM_ROLE_PREFIX;
import static org.wso2.carbon.user.core.UserCoreConstants.INTERNAL_ROLES_CLAIM;
import static org.wso2.carbon.user.core.UserCoreConstants.ROLE_CLAIM;
import static org.wso2.carbon.user.core.UserCoreConstants.SYSTEM_DOMAIN_NAME;
import static org.wso2.carbon.user.core.UserCoreConstants.USER_STORE_GROUPS_CLAIM;
import static org.wso2.carbon.user.core.UserStoreConfigConstants.RESOLVE_GROUP_NAME_FROM_USER_ID_CACHE_NAME;
import static org.wso2.carbon.user.core.UserStoreConfigConstants.RESOLVE_USER_ID_FROM_USER_NAME_CACHE_NAME;
import static org.wso2.carbon.user.core.UserStoreConfigConstants.RESOLVE_USER_NAME_FROM_UNIQUE_USER_ID_CACHE_NAME;
Expand Down Expand Up @@ -2331,6 +2315,20 @@ private void handleGetUserListFailure(String errorCode, String errorMassage, Con
}
}

private void handleCursorGetUserListFailure(String errorCode, String errorMassage, Condition condition,
String domain, String profileName, int limit, String cursor, String direction, String sortBy,
String sortOrder) throws UserStoreException {

for (UserManagementErrorEventListener listener : UMListenerServiceComponent
.getUserManagementErrorEventListeners()) {
if (listener.isEnable() && listener instanceof AbstractUserManagementErrorListener && !listener
.onGetUserListFailure(errorCode, errorMassage, condition, domain, profileName, limit, cursor,
direction, sortBy, sortOrder, this)) {
return;
}
}
}

private void handleGetUserListFailureWithID(String errorCode, String errorMassage, Condition condition,
String domain, String profileName, int limit, int offset, String sortBy, String sortOrder)
throws UserStoreException {
Expand Down Expand Up @@ -10260,7 +10258,6 @@ protected PaginatedSearchResult doGetUserList(Condition condition, String profil
return new PaginatedSearchResult();
}

//TODO - This method is required for a few other methods to use (found under getUserList and etc)
protected UniqueIDPaginatedSearchResult doGetUserListWithID(Condition condition, String profileName, int limit,
int offset, String sortBy, String sortOrder) throws UserStoreException {

Expand All @@ -10270,8 +10267,6 @@ protected UniqueIDPaginatedSearchResult doGetUserListWithID(Condition condition,
throw new NotImplementedException("doGetUserListWithID operation is not implemented in: " + this.getClass());
}

//TODO - If the LDAP method also implements cursor like the JDBC one, then the above method can be removed
// (Edit: it cannot be removed)
protected UniqueIDPaginatedSearchResult doGetUserListWithID(Condition condition, String profileName, int limit,
Integer offset, String cursor, String direction, String sortBy, String sortOrder)
throws UserStoreException {
Expand Down Expand Up @@ -15570,8 +15565,8 @@ public List<User> getUserListWithID(Condition condition, String domain, String p

// Call the listeners to get the filtered users from relevant identity store.
if (secondaryUserStoreManager != null) {
handlePreGetUserListWithIdentityClaims(duplicateCondition, domain, profileName, limit, offset, sortBy,
sortOrder, secondaryUserStoreManager, identityClaimFilteredUserNames,
handlePreGetUserListWithIdentityClaims(duplicateCondition, domain, profileName, limit, offset, cursor,
direction, sortBy, sortOrder, secondaryUserStoreManager, identityClaimFilteredUserNames,
hasNonIdentityClaimFilterConditions);
}

Expand Down Expand Up @@ -15731,9 +15726,9 @@ public List<User> getUserListWithID(Condition condition, String domain, String p
}

// Call the listeners to get the filtered users from relevant identity store.
if (secondaryUserStoreManager != null) { //TODO - changes need to be made.
handlePreGetUserListWithIdentityClaims(duplicateCondition, domain, profileName, limit, offset, sortBy,
sortOrder, secondaryUserStoreManager, identityClaimFilteredUserNames,
if (secondaryUserStoreManager != null) {
handlePreGetUserListWithIdentityClaims(duplicateCondition, domain, profileName, limit, offset, cursor, direction,
sortBy, sortOrder, secondaryUserStoreManager, identityClaimFilteredUserNames,
hasNonIdentityClaimFilterConditions);
}

Expand Down Expand Up @@ -15773,61 +15768,67 @@ public List<User> getUserListWithID(Condition condition, String domain, String p
// The identity claims are not user store based.
List<User> tempFilteredUsers;
List<User> aggregateUserList = new ArrayList<>();
int offsetCounter = 0;
int paginationLimit;
String cursorCounter = new String(cursor);

if (offset != null) {
if (offset <= 0) {
paginationLimit = limit;
} else {
paginationLimit = (offset - 1) + limit;
Set<User> prevIterationFilteredUsers = new HashSet<>();
while (aggregateUserList.size() < limit) {
tempFilteredUsers = getFilteredUsers(duplicateCondition, profileName, limit, offset, cursorCounter,
direction, sortBy, sortOrder, secondaryUserStoreManager);

if (tempFilteredUsers.isEmpty()) {
// Means no users has been filtered in this particular iteration and hence can exit the flow.
break;
}

Set<User> prevIterationFilteredUsers = new HashSet<>();
while (aggregateUserList.size() < paginationLimit) { //TODO - Changes need to be made.
tempFilteredUsers = getFilteredUsers(duplicateCondition, profileName, limit, offsetCounter, cursor,
direction, sortBy, sortOrder, secondaryUserStoreManager);
// Prevent same set of users being returned and break the loop if so.
if (isExactSameFilteredUsers(tempFilteredUsers, prevIterationFilteredUsers)) {
break;
}

if (tempFilteredUsers.isEmpty()) {
// Means no users has been filtered in this particular iteration and hence can exit the flow.
break;
}
prevIterationFilteredUsers.clear();
prevIterationFilteredUsers.addAll(tempFilteredUsers);

// Prevent same set of users being returned and break the loop if so.
if (isExactSameFilteredUsers(tempFilteredUsers, prevIterationFilteredUsers)) {
break;
// For next iteration consider the offset from last fetched size of users.
if (!(tempFilteredUsers.size() < limit)) {
if (UserCoreConstants.PREVIOUS.equals(direction)) {
cursorCounter = tempFilteredUsers.get(0).getPreferredUsername();
} else {
cursorCounter = tempFilteredUsers.get(tempFilteredUsers.size()-1).getPreferredUsername();
}

prevIterationFilteredUsers.clear();
prevIterationFilteredUsers.addAll(tempFilteredUsers);

// For next iteration consider the offset from last fetched size of users.
offsetCounter += limit;

// Taking the interception of the user list.
tempFilteredUsers.retainAll(identityClaimFilteredUsers);
aggregateUserList.addAll(tempFilteredUsers);
} else {
// Taking the interception of the user list.
tempFilteredUsers.retainAll(identityClaimFilteredUsers);
aggregateUserList.addAll(tempFilteredUsers);
break;
}
}

// Removing duplicates.
aggregateUserList = aggregateUserList.stream().distinct().collect(Collectors.toList());

// Removing duplicates.
aggregateUserList = aggregateUserList.stream().distinct().collect(Collectors.toList());
if (UserCoreConstants.PREVIOUS.equals(direction)) {
aggregateUserList.sort(new Comparator<User>() {
@Override
public int compare(User user1, User user2) {

// Pagination
if (offset <= 0) {
offset = 0;
} else {
offset = offset - 1;
}
//For Ascending Order
return user1.getUsername().compareTo(user2.getUsername());

if (aggregateUserList.isEmpty()) {
filteredUsers = aggregateUserList;
} else if (offset > aggregateUserList.size()) {
filteredUsers = new ArrayList<>();
} else if (aggregateUserList.size() < paginationLimit) {
filteredUsers = aggregateUserList.subList(offset, aggregateUserList.size());
} else {
filteredUsers = aggregateUserList.subList(offset, paginationLimit);
}
//For Descending Order
//return user2.getUsername().compareTo(user1.getUsername());
}
});
}

if (aggregateUserList.isEmpty()) {
filteredUsers = aggregateUserList;
} else if (aggregateUserList.size() < limit) {
filteredUsers = aggregateUserList.subList(0, aggregateUserList.size());
} else {
filteredUsers = aggregateUserList.subList(0, limit);
}
} else {
/* When the filters has only the non-identity claims or if Identity claims are persisted in User store
Expand Down Expand Up @@ -15927,8 +15928,8 @@ private Condition getDuplicateCondition(Condition condition) {
* @throws UserStoreException User store exception.
*/
private void handlePreGetUserListWithIdentityClaims(Condition condition, String domain, String profileName,
int limit, Integer offset, String sortBy, String sortOrder,
UserStoreManager secManager,
int limit, Integer offset, String cursor, String direction,
String sortBy, String sortOrder, UserStoreManager secManager,
List<String> identityClaimFilteredUserNames,
boolean hasNonIdentityClaimFilters) throws UserStoreException {

Expand All @@ -15940,16 +15941,30 @@ private void handlePreGetUserListWithIdentityClaims(Condition condition, String
(AbstractUserOperationEventListener) listener;

if (!hasNonIdentityClaimFilters) {
// In this case, can filter with Identity claim filters and paginate at DB level.
if (!newListener.doPreGetPaginatedUserList(condition, identityClaimFilteredUserNames,
domain, secManager, limit, offset)) {
handleGetUserListFailure(
ErrorMessages.ERROR_CODE_ERROR_WHILE_GETTING_PAGINATED_USER_LIST.getCode(),
String.format(ErrorMessages.ERROR_CODE_ERROR_WHILE_GETTING_PAGINATED_USER_LIST
.getMessage(),
UserCoreErrorConstants.PRE_LISTENER_TASKS_FAILED_MESSAGE),
condition, domain, profileName, limit, offset, sortBy, sortOrder);
break;
if (cursor == null) {
// In this case, can filter with Identity claim filters and paginate at DB level.
if (!newListener.doPreGetPaginatedUserList(condition, identityClaimFilteredUserNames,
domain, secManager, limit, offset)) {
handleGetUserListFailure(
ErrorMessages.ERROR_CODE_ERROR_WHILE_GETTING_PAGINATED_USER_LIST.getCode(),
String.format(ErrorMessages.ERROR_CODE_ERROR_WHILE_GETTING_PAGINATED_USER_LIST
.getMessage(), UserCoreErrorConstants.PRE_LISTENER_TASKS_FAILED_MESSAGE),
condition, domain, profileName, limit, offset, sortBy, sortOrder);
break;
}
} else {
// In this case, can filter with Identity claim filters and paginate at DB level.
if (!newListener.doPreGetPaginatedUserList(condition, identityClaimFilteredUserNames,
domain, secManager, limit, cursor, direction)) {
//Introduced a new method because there may be more instances where this
// method is called in other repos.
handleCursorGetUserListFailure(
ErrorMessages.ERROR_CODE_ERROR_WHILE_GETTING_PAGINATED_USER_LIST.getCode(),
String.format(ErrorMessages.ERROR_CODE_ERROR_WHILE_GETTING_PAGINATED_USER_LIST
.getMessage(), UserCoreErrorConstants.PRE_LISTENER_TASKS_FAILED_MESSAGE),
condition, domain, profileName, limit, cursor, direction, sortBy, sortOrder);
break;
}
}
} else {
// In this case, can filter with Identity claim filters and fetch whole filtered list.
Expand Down
Loading

0 comments on commit 17bbc5e

Please sign in to comment.