Skip to content

RANGER-5212: Search filter in Roles tab does not consider all relevant role columns #580

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

Merged
mneethiraj merged 1 commit into from
Dec 30, 2025
+45 −45
Merged

RANGER-5212: Search filter in Roles tab does not consider all relevant role columns #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 33 additions & 36 deletions security-admin/src/main/java/org/apache/ranger/biz/RoleDBStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,68 +299,45 @@ public void initStore() {
}

public RangerRoleList getRoles(SearchFilter filter, RangerRoleList rangerRoleList) throws Exception {
List<RangerRole> roles = new ArrayList<>();
List<XXRole> xxRoles = roleService.searchResources(filter, roleService.searchFields, roleService.sortFields, rangerRoleList);
List<RangerRole> roles = getRoles(filter);

if (CollectionUtils.isNotEmpty(xxRoles)) {
for (XXRole xxRole : xxRoles) {
roles.add(roleService.read(xxRole.getId()));
}
}

rangerRoleList.setRoleList(roles);
setPaginatedResult(roles, filter, rangerRoleList);

return rangerRoleList;
}

public RangerRoleList getRolesForUser(SearchFilter filter, RangerRoleList rangerRoleList) {
List<RangerRole> roles = new ArrayList<>();
public RangerRoleList getRolesForUser(SearchFilter filter, RangerRoleList rangerRoleList) throws Exception {
if (filter == null) {
filter = new SearchFilter();
}

List<RangerRole> roles;
UserSessionBase userSession = ContextUtil.getCurrentUserSession();

if (userSession != null && userSession.getUserRoleList().size() == 1 && userSession.getUserRoleList().contains(RangerConstants.ROLE_USER) && userSession.getLoginId() != null) {
VXUser loggedInVXUser = xUserService.getXUserByUserName(userSession.getLoginId());
List<XXRole> xxRoles = daoMgr.getXXRole().findByUserId(loggedInVXUser.getId());

roles = new ArrayList<>();

if (CollectionUtils.isNotEmpty(xxRoles)) {
for (XXRole xxRole : xxRoles) {
roles.add(roleService.read(xxRole.getId()));
}
}

if (predicateUtil != null && filter != null && !filter.isEmpty()) {
if (predicateUtil != null && !filter.isEmpty()) {
List<RangerRole> copy = new ArrayList<>(roles);

predicateUtil.applyFilter(copy, filter);

roles = copy;
}

int totalCount = roles.size();
int startIndex = filter.getStartIndex();
int pageSize = filter.getMaxRows();
int toIndex = Math.min(startIndex + pageSize, totalCount);

if (CollectionUtils.isNotEmpty(roles)) {
roles = roles.subList(startIndex, toIndex);

rangerRoleList.setResultSize(roles.size());
rangerRoleList.setPageSize(filter.getMaxRows());
rangerRoleList.setSortBy(filter.getSortBy());
rangerRoleList.setSortType(filter.getSortType());
rangerRoleList.setStartIndex(filter.getStartIndex());
rangerRoleList.setTotalCount(totalCount);
}
} else {
List<XXRole> xxRoles = roleService.searchResources(filter, roleService.searchFields, roleService.sortFields, rangerRoleList);

if (CollectionUtils.isNotEmpty(xxRoles)) {
for (XXRole xxRole : xxRoles) {
roles.add(roleService.read(xxRole.getId()));
}
}
roles = getRoles(filter);
}

rangerRoleList.setRoleList(roles);
setPaginatedResult(roles, filter, rangerRoleList);

return rangerRoleList;
}
Expand Down Expand Up @@ -500,6 +477,26 @@ private boolean ensureRoleNotInZone(String roleName) {
return roleRefZoneCount < 1;
}

private void setPaginatedResult(List<RangerRole> roles, SearchFilter filter, RangerRoleList result) {
int totalCount = roles.size();
int startIndex = filter.getStartIndex();
int pageSize = filter.getMaxRows();
int toIndex = Math.min(startIndex + pageSize, totalCount);

if (CollectionUtils.isNotEmpty(roles)) {
roles = roles.subList(startIndex, toIndex);

result.setResultSize(roles.size());
result.setPageSize(filter.getMaxRows());
result.setSortBy(filter.getSortBy());
result.setSortType(filter.getSortType());
result.setStartIndex(filter.getStartIndex());
result.setTotalCount(totalCount);
}

result.setRoleList(roles);
}

public static class RoleVersionUpdater implements Runnable {
final RangerDaoManager daoManager;

Expand Down
21 changes: 12 additions & 9 deletions security-admin/src/test/java/org/apache/ranger/biz/TestRoleDBStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,17 @@ public void testGetRoleByRoleId() throws Exception {

@Test
public void testGetRolesBySearchFilter() throws Exception {
RangerRole rangerRole = getRangerRole();
RangerRoleList rangerRoleList = new RangerRoleList(Collections.singletonList(rangerRole));
XXRole xxRole = getTestRole();
List<XXRole> xxRoles = Collections.singletonList(xxRole);
SearchFilter searchFilter = new SearchFilter();
XXRoleDao xxRoleDao = Mockito.mock(XXRoleDao.class);
XXRole xxRole = getTestRole();
List<XXRole> xxRoles = Collections.singletonList(xxRole);
SearchFilter searchFilter = new SearchFilter();
RangerRole rangerRole = getRangerRole();

Mockito.when(roleService.searchResources(searchFilter, roleService.searchFields, roleService.sortFields, rangerRoleList)).thenReturn(xxRoles);
Mockito.when(daoMgr.getXXRole()).thenReturn(xxRoleDao);
Mockito.when(xxRoleDao.getAll()).thenReturn(xxRoles);
Mockito.when(roleService.read(xxRole.getId())).thenReturn(rangerRole);

RangerRoleList rangerRoleListInDB = roleDBStore.getRoles(searchFilter, rangerRoleList);
RangerRoleList rangerRoleListInDB = roleDBStore.getRoles(searchFilter, new RangerRoleList());

Assertions.assertNotNull(rangerRoleListInDB);
Assertions.assertEquals(1, rangerRoleListInDB.getList().size());
Expand All @@ -156,12 +157,14 @@ public void testGetRolesBySearchFilter() throws Exception {
@Test
public void testGetRolesForUser_WithoutUserSession() throws Exception {
RangerRole rangerRole = getRangerRole();
RangerRoleList rangerRoleList = new RangerRoleList(Collections.singletonList(rangerRole));
RangerRoleList rangerRoleList = new RangerRoleList();
XXRole xxRole = getTestRole();
List<XXRole> xxRoles = Collections.singletonList(xxRole);
SearchFilter searchFilter = new SearchFilter();
XXRoleDao xxRoleDao = Mockito.mock(XXRoleDao.class);

Mockito.when(roleService.searchResources(searchFilter, roleService.searchFields, roleService.sortFields, rangerRoleList)).thenReturn(xxRoles);
Mockito.when(daoMgr.getXXRole()).thenReturn(xxRoleDao);
Mockito.when(xxRoleDao.getAll()).thenReturn(xxRoles);
Mockito.when(roleService.read(xxRole.getId())).thenReturn(rangerRole);

RangerContextHolder.setSecurityContext(null);
Expand Down
Loading