[ranger] branch ranger-2.2 updated: RANGER-3122: Support delegate-admin for specific permissions - Part 3

[abhay]

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

abhay pushed a commit to branch ranger-2.2
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.2 by this push:
     new 7e987c2  RANGER-3122: Support delegate-admin for specific permissions 
- Part 3
7e987c2 is described below

commit 7e987c2865c501f77bb349c3eb8d5dc2b37a057a
Author: Abhay Kulkarni <ab...@apache.org>
AuthorDate: Fri Jan 8 12:47:29 2021 -0800

    RANGER-3122: Support delegate-admin for specific permissions - Part 3
---
 security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java | 5 +++--
 .../src/test/java/org/apache/ranger/rest/TestServiceREST.java        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java 
b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 8db022e..d286a50 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -3506,8 +3506,8 @@ public class ServiceREST {
 
                                        servicePoliciesMap.put(serviceName, 
policyList);
                                }
-                                       policyList.add(policy);
-                               }
+                               policyList.add(policy);
+                       }
 
                        for (Map.Entry<String, List<RangerPolicy>> entry : 
servicePoliciesMap.entrySet()) {
                                String             serviceName  = 
entry.getKey();
@@ -3517,6 +3517,7 @@ public class ServiceREST {
                                        boolean isServiceAdminUser = 
svcStore.isServiceAdminUser(serviceName, userName);
                                        if (isServiceAdminUser) {
                                                ret.addAll(listToFilter);
+                                               continue;
                                        } else if (isAdmin || isKeyAdmin || 
isAuditAdmin || isAuditKeyAdmin) {
                                                XXService xService     = 
daoManager.getXXService().findByName(serviceName);
                                                Long      serviceDefId = 
xService.getType();
diff --git 
a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java 
b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
index b67656e..59cf22d 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
@@ -1091,9 +1091,9 @@ public class TestServiceREST {
                Mockito.when(searchUtil.getSearchFilter(request, 
policyService.sortFields)).thenReturn(filter);
                Mockito.when(svcStore.getPolicies(filter)).thenReturn(policies);
                /*here we are setting serviceAdminRole, so we will get the 
required policy with serviceAdmi role*/
-               Mockito.when(daoManager.getXXGroupUser()).thenReturn(xGroupDao);
+               
//Mockito.when(daoManager.getXXGroupUser()).thenReturn(xGroupDao);
                Mockito.when(svcStore.isServiceAdminUser(rPol.getService(), 
null)).thenReturn(true);
-               
Mockito.doReturn(policyAdmin).when(spySVCRest).getPolicyAdminForDelegatedAdmin("HDFS_1-1-20150316062453");
+               
//Mockito.doReturn(policyAdmin).when(spySVCRest).getPolicyAdminForDelegatedAdmin("HDFS_1-1-20150316062453");
                RangerPolicyList dbRangerPolicy = 
spySVCRest.getPolicies(request);
                Assert.assertNotNull(dbRangerPolicy);
                Assert.assertEquals(dbRangerPolicy.getListSize(), 1);