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

Open
RakeshGuptaDev wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

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
1 change: 1 addition & 0 deletions agents-common/src/main/java/org/apache/ranger/plugin/store/RolePredicateUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public void addPredicates(SearchFilter filter, List<Predicate> predicates) {
addPredicateForPartialRoleName(filter.getParam(SearchFilter.ROLE_NAME_PARTIAL), predicates);
addPredicateForPartialGroupName(filter.getParam(SearchFilter.GROUP_NAME_PARTIAL), predicates);
addPredicateForPartialUserName(filter.getParam(SearchFilter.USER_NAME_PARTIAL), predicates);
addPredicateForPartialRoleName(filter.getParam(SearchFilter.ASSOCIATED_ROLE_NAME_PARTIAL), predicates);
}

private Predicate addPredicateForRoleName(final String roleName, List<Predicate> predicates) {
Expand Down
2 changes: 2 additions & 0 deletions agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public class SearchFilter {
public static final String ZONE_NAME_PREFIX = "zoneNamePrefix"; // search
public static final String POLICY_NAME_PREFIX = "policyNamePrefix";

public static final String ASSOCIATED_ROLE_NAME_PARTIAL = "associatedRoleNamePartial"; // search

public static final String TAG_DEF_ID = "tagDefId"; // search
public static final String TAG_DEF_GUID = "tagDefGuid"; // search
public static final String TAG_NAMES = "tagNames"; // search
Expand Down
1 change: 1 addition & 0 deletions security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public SearchFilter getSearchFilter(@Nonnull HttpServletRequest request, List<So
ret.setParam(SearchFilter.ROLE_NAME_PARTIAL, request.getParameter(SearchFilter.ROLE_NAME_PARTIAL));
ret.setParam(SearchFilter.GROUP_NAME_PARTIAL, request.getParameter(SearchFilter.GROUP_NAME_PARTIAL));
ret.setParam(SearchFilter.USER_NAME_PARTIAL, request.getParameter(SearchFilter.USER_NAME_PARTIAL));
ret.setParam(SearchFilter.ASSOCIATED_ROLE_NAME_PARTIAL, request.getParameter(SearchFilter.ASSOCIATED_ROLE_NAME_PARTIAL));
ret.setParam(SearchFilter.CLUSTER_NAME, request.getParameter(SearchFilter.CLUSTER_NAME));
ret.setParam(SearchFilter.FETCH_ZONE_UNZONE_POLICIES, request.getParameter(SearchFilter.FETCH_ZONE_UNZONE_POLICIES));
ret.setParam(SearchFilter.FETCH_TAG_POLICIES, request.getParameter(SearchFilter.FETCH_TAG_POLICIES));
Expand Down
1 change: 1 addition & 0 deletions security-admin/src/main/java/org/apache/ranger/service/RangerRoleServiceBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public RangerRoleServiceBase() {
searchFields.add(new SearchField(SearchFilter.ROLE_NAME_PARTIAL, "obj.name", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
searchFields.add(new SearchField(SearchFilter.GROUP_NAME_PARTIAL, "xXRoleRefGroup.groupName", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL, "XXRoleRefGroup xXRoleRefGroup", "xXRoleRefGroup.roleId = obj.id"));
searchFields.add(new SearchField(SearchFilter.USER_NAME_PARTIAL, "xXRoleRefUser.userName", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL, "XXRoleRefUser xXRoleRefUser", "xXRoleRefUser.roleId = obj.id"));
searchFields.add(new SearchField(SearchFilter.ASSOCIATED_ROLE_NAME_PARTIAL, "xXRoleRefRole.subRoleName", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL, "XXRoleRefRole xXRoleRefRole", "xXRoleRefRole.roleId = obj.id"));

sortFields.add(new SortField(SearchFilter.CREATE_TIME, "obj.createTime"));
sortFields.add(new SortField(SearchFilter.UPDATE_TIME, "obj.updateTime"));
Expand Down
6 changes: 6 additions & 0 deletions .../src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ function Roles() {
label: "User Name",
urlLabel: "userName",
type: "text"
},
{
category: "associatedRoleNamePartial",
label: "Associated Role Name",
urlLabel: "associatedRoleName",
type: "text"
}
];

Expand Down