From bdeacf4317e1610ce673cd2e366123c87cba2a25 Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakesh.gupta.dev264@gmail.com>
Date: Mon, 26 May 2025 18:17:58 +0530
Subject: [PATCH] RANGER-5212: Search filter in Roles tab does not consider all
 relevant role columns

---
 .../org/apache/ranger/plugin/store/RolePredicateUtil.java   | 1 +
 .../java/org/apache/ranger/plugin/util/SearchFilter.java    | 2 ++
 .../java/org/apache/ranger/common/RangerSearchUtil.java     | 1 +
 .../org/apache/ranger/service/RangerRoleServiceBase.java    | 1 +
 .../views/UserGroupRoleListing/role_details/RoleListing.jsx | 6 ++++++
 5 files changed, 11 insertions(+)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/RolePredicateUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/RolePredicateUtil.java
index 84b49ecc3b..7a55454aba 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/RolePredicateUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/RolePredicateUtil.java
@@ -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) {
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
index 3704aa3e78..14d3c636fb 100755
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
@@ -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
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index a8aab0f5fa..f290d4688f 100755
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -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));
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerRoleServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerRoleServiceBase.java
index e5832850ce..611acb33e3 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerRoleServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerRoleServiceBase.java
@@ -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"));
diff --git a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx
index df28b2546f..276cd9125e 100644
--- a/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx
+++ b/security-admin/src/main/webapp/react-webapp/src/views/UserGroupRoleListing/role_details/RoleListing.jsx
@@ -326,6 +326,12 @@ function Roles() {
       label: "User Name",
       urlLabel: "userName",
       type: "text"
+    },
+    {
+      category: "associatedRoleNamePartial",
+      label: "Associated Role Name",
+      urlLabel: "associatedRoleName",
+      type: "text"
     }
   ];