[ranger] branch master updated: RANGER-2796 : Ranger Reports page to show user + groups policies for user based search

[pradeep]

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 845700e  RANGER-2796 : Ranger Reports page to show user + groups 
policies for user based search
845700e is described below

commit 845700e977d5560186557105ae7bb5c4c5793d92
Author: Dineshkumar Yadav <dineshkumar.ya...@outlook.com>
AuthorDate: Wed Apr 15 21:10:09 2020 +0530

    RANGER-2796 : Ranger Reports page to show user + groups policies for user 
based search
    
    Signed-off-by: pradeep <prad...@apache.org>
---
 .../src/main/java/org/apache/ranger/biz/ServiceDBStore.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 @@ public class ServiceDBStore extends AbstractServiceStore {
                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 @@ public class ServiceDBStore extends AbstractServiceStore {
                                                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()));