RANGER-2796 : Ranger Reports page to show user + groups policies for user based search
Signed-off-by: pradeep <pradeep@apache.org>
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 9be61f2..857a597 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -4689,6 +4689,7 @@
RangerPolicyList retList = new RangerPolicyList();
Map<Long,RangerPolicy> policyMap=new HashMap<Long,RangerPolicy>();
Set<Long> processedServices=new HashSet<Long>();
+ Set<Long> processedServicesForGroup=new HashSet<Long>();
Set<Long> processedPolicies=new HashSet<Long>();
Comparator<RangerPolicy> comparator = new Comparator<RangerPolicy>() {
public int compare(RangerPolicy c1, RangerPolicy c2) {
@@ -4718,8 +4719,8 @@
for (XXPolicy xPol2 : xPolList2) {
if(xPol2!=null){
if(!processedPolicies.contains(xPol2.getId())){
- if(!processedServices.contains(xPol2.getService())){
- loadRangerPolicies(xPol2.getService(),processedServices,policyMap,searchFilter);
+ if(!processedServicesForGroup.contains(xPol2.getService())){
+ loadRangerPolicies(xPol2.getService(),processedServicesForGroup,policyMap,searchFilter);
}
if(policyMap.containsKey(xPol2.getId())){
policyList.add(policyMap.get(xPol2.getId()));
