You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ki...@apache.org on 2025/10/23 08:04:48 UTC

(ranger) branch master updated (75e4bd4e3 -> c731ac3a5)

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

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


    from 75e4bd4e3 RANGER-5231: GDS feature support on SqlServer database
     new a522bc6fd RANGER-5345: [GDS] Shared resource creation api is failing for oracle db
     new c731ac3a5 RANGER-4771: Remove the calls to ensureAdminAccess() in grantAccess() and revokeAccess()

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ranger/authorization/utils/JsonUtils.java      | 13 ++++----
 .../java/org/apache/ranger/rest/ServiceREST.java   | 39 +++++++++++++++++-----
 .../main/resources/META-INF/jpa_named_queries.xml  | 14 ++++----
 .../org/apache/ranger/rest/TestServiceREST.java    |  6 +++-
 4 files changed, 50 insertions(+), 22 deletions(-)


(ranger) 01/02: RANGER-5345: [GDS] Shared resource creation api is failing for oracle db

Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a522bc6fda3de336bf38dbe42395fe4e57b54f7a
Author: sanket-shelar <sa...@gmail.com>
AuthorDate: Wed Oct 1 16:35:32 2025 +0530

    RANGER-5345: [GDS] Shared resource creation api is failing for oracle db
    
    Signed-off-by: Kishor Gollapalliwar <ki...@gmail.com>
---
 .../org/apache/ranger/authorization/utils/JsonUtils.java   | 13 +++++++------
 .../src/main/resources/META-INF/jpa_named_queries.xml      | 14 ++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java b/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java
index ff0fe452d..507ecc366 100755
--- a/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java
@@ -276,13 +276,14 @@ public static List<RangerTag> jsonToRangerTagList(String jsonStr) {
     }
 
     public static List<RangerGdsMaskInfo> jsonToListGdsMaskInfo(String jsonStr) {
-        try {
-            return getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO);
-        } catch (Exception e) {
-            LOG.error("Cannot get Map<String, RangerPolicyItemDataMaskInfo> from {}", jsonStr, e);
-
-            return null;
+        if (StringUtils.isNotEmpty(jsonStr)) {
+            try {
+                return getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO);
+            } catch (Exception e) {
+                LOG.error("Cannot get List<RangerGdsMaskInfo> from {}", jsonStr, e);
+            }
         }
+        return null;
     }
 
     public static Map<String, RangerPolicyResource> jsonToMapPolicyResource(String jsonStr) {
diff --git a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
index 265479422..30db0eacb 100755
--- a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
+++ b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
@@ -2263,12 +2263,14 @@
 	</named-query>
 
 	<named-query name="XXGdsProject.findProjectsWithDataShareInStatus">
-		<query>SELECT DISTINCT obj FROM XXGdsProject obj, XXGdsDatasetInProject dip, XXGdsDataShareInDataset dshid
-			WHERE dshid.dataShareId = :dataShareId
-			  AND dshid.status      = :status
-			  AND dip.datasetId     = dshid.datasetId
-			  AND dip.projectId     = obj.id
-			  AND dip.status        = :status</query>
+		<query>SELECT obj FROM XXGdsProject obj
+			WHERE EXISTS (
+				SELECT 1 FROM XXGdsDatasetInProject dip, XXGdsDataShareInDataset dshid
+				  WHERE dshid.dataShareId = :dataShareId
+				    AND dshid.status      = :status
+				    AND dip.datasetId     = dshid.datasetId
+				    AND dip.projectId     = obj.id
+				    AND dip.status        = :status)</query>
 	</named-query>
 
 	<named-query name="XXGdsProject.findServiceIds">


(ranger) 02/02: RANGER-4771: Remove the calls to ensureAdminAccess() in grantAccess() and revokeAccess()

Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c731ac3a53f957bbd117c3d38b12c5b34c18d8ce
Author: sanket-shelar <sa...@gmail.com>
AuthorDate: Thu Oct 16 21:08:03 2025 +0530

    RANGER-4771: Remove the calls to ensureAdminAccess() in grantAccess() and revokeAccess()
    
    Signed-off-by: Kishor Gollapalliwar <ki...@gmail.com>
---
 .../java/org/apache/ranger/rest/ServiceREST.java   | 39 +++++++++++++++++-----
 .../org/apache/ranger/rest/TestServiceREST.java    |  6 +++-
 2 files changed, 35 insertions(+), 10 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 169f078af..16b13b99d 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
@@ -42,6 +42,7 @@
 import org.apache.ranger.biz.ServiceDBStore.JSON_FILE_NAME_TYPE;
 import org.apache.ranger.biz.ServiceMgr;
 import org.apache.ranger.biz.TagDBStore;
+import org.apache.ranger.biz.UserMgr;
 import org.apache.ranger.biz.XUserMgr;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.ContextUtil;
@@ -150,6 +151,7 @@
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -262,6 +264,9 @@ public class ServiceREST {
     @Autowired
     RangerTransactionSynchronizationAdapter rangerTransactionSynchronizationAdapter;
 
+    @Autowired
+    UserMgr userMgrGrantor;
+
     private RangerPolicyEngineOptions delegateAdminOptions;
     private RangerPolicyEngineOptions policySearchAdminOptions;
     private RangerPolicyEngineOptions defaultAdminOptions;
@@ -1178,7 +1183,7 @@ public RESTResponse grantAccess(@PathParam("serviceName") String serviceName, Gr
                         if (policyUpdated) {
                             policy.setZoneName(zoneName);
 
-                            ensureAdminAccess(policy);
+                            ensureAdminAccess(policy, userName);
 
                             svcStore.updatePolicy(policy);
                         } else {
@@ -1220,7 +1225,7 @@ public RESTResponse grantAccess(@PathParam("serviceName") String serviceName, Gr
                         policy.addPolicyItem(policyItem);
                         policy.setZoneName(zoneName);
 
-                        ensureAdminAccess(policy);
+                        ensureAdminAccess(policy, userName);
 
                         svcStore.createPolicy(policy);
                     }
@@ -1295,7 +1300,7 @@ public RESTResponse secureGrantAccess(@PathParam("serviceName") String serviceNa
                             if (policyUpdated) {
                                 policy.setZoneName(zoneName);
 
-                                ensureAdminAccess(policy);
+                                ensureAdminAccess(policy, userName);
 
                                 svcStore.updatePolicy(policy);
                             } else {
@@ -1337,7 +1342,7 @@ public RESTResponse secureGrantAccess(@PathParam("serviceName") String serviceNa
                             policy.addPolicyItem(policyItem);
                             policy.setZoneName(zoneName);
 
-                            ensureAdminAccess(policy);
+                            ensureAdminAccess(policy, userName);
 
                             svcStore.createPolicy(policy);
                         }
@@ -1422,7 +1427,7 @@ public RESTResponse revokeAccess(@PathParam("serviceName") String serviceName, G
                         if (policyUpdated) {
                             policy.setZoneName(zoneName);
 
-                            ensureAdminAccess(policy);
+                            ensureAdminAccess(policy, userName);
 
                             svcStore.updatePolicy(policy);
                         } else {
@@ -1501,7 +1506,7 @@ public RESTResponse secureRevokeAccess(@PathParam("serviceName") String serviceN
                             if (policyUpdated) {
                                 policy.setZoneName(zoneName);
 
-                                ensureAdminAccess(policy);
+                                ensureAdminAccess(policy, userName);
 
                                 svcStore.updatePolicy(policy);
                             } else {
@@ -3205,11 +3210,27 @@ public RangerPolicy getPolicyByName(String serviceName, String policyName, Strin
     }
 
     void ensureAdminAccess(RangerPolicy policy) {
+        ensureAdminAccess(policy, null);
+    }
+
+    void ensureAdminAccess(RangerPolicy policy, String grantor) {
         blockIfGdsService(policy.getService());
 
-        boolean isAdmin    = bizUtil.isAdmin();
-        boolean isKeyAdmin = bizUtil.isKeyAdmin();
-        String  userName   = bizUtil.getCurrentUserLoginId();
+        final String  userName;
+        final boolean isAdmin;
+        final boolean isKeyAdmin;
+
+        if (StringUtils.isEmpty(grantor)) {
+            userName   = bizUtil.getCurrentUserLoginId();
+            isAdmin    = bizUtil.isAdmin();
+            isKeyAdmin = bizUtil.isKeyAdmin();
+        } else {
+            Collection<String> userRoles = userMgrGrantor.getRolesByLoginId(grantor);
+
+            userName   = grantor;
+            isAdmin    = userRoles.contains(RangerConstants.ROLE_SYS_ADMIN);
+            isKeyAdmin = userRoles.contains(RangerConstants.ROLE_KEY_ADMIN);
+        }
         boolean isSvcAdmin = isAdmin || svcStore.isServiceAdminUser(policy.getService(), userName);
 
         if (!isAdmin && !isKeyAdmin && !isSvcAdmin) {
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 c3e3d6c33..c92c8d3e9 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
@@ -30,6 +30,7 @@
 import org.apache.ranger.biz.ServiceDBStore.JSON_FILE_NAME_TYPE;
 import org.apache.ranger.biz.ServiceMgr;
 import org.apache.ranger.biz.TagDBStore;
+import org.apache.ranger.biz.UserMgr;
 import org.apache.ranger.biz.XUserMgr;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.MessageEnums;
@@ -227,6 +228,8 @@ public class TestServiceREST {
     RangerPolicyAdmin policyAdmin;
     @Mock
     RangerTransactionSynchronizationAdapter rangerTransactionSynchronizationAdapter;
+    @Mock
+    UserMgr           userMgrGrantor;
     private String capabilityVector;
 
     public void setup() {
@@ -2023,7 +2026,7 @@ public void test14bGrantAccess() throws Exception {
         Mockito.when(svcStore.getServiceByName(Mockito.anyString())).thenReturn(Mockito.mock(RangerService.class));
         Mockito.when(daoManager.getXXServiceDef().findServiceDefTypeByServiceName(Mockito.anyString())).thenReturn("hdfs");
         Mockito.when(bizUtil.isUserRangerAdmin(Mockito.anyString())).thenReturn(true);
-        Mockito.when(bizUtil.isAdmin()).thenReturn(true);
+        Mockito.when(userMgrGrantor.getRolesByLoginId(Mockito.anyString())).thenReturn(Arrays.asList("ROLE_SYS_ADMIN"));
         RESTResponse restResponse = serviceREST.grantAccess(serviceName, grantRequestObj, request);
         Mockito.verify(svcStore, Mockito.times(1)).createPolicy(Mockito.any(RangerPolicy.class));
         Assertions.assertNotNull(restResponse);
@@ -2046,6 +2049,7 @@ public void test64SecureGrantAccess() {
         mockValidateGrantRevokeRequest();
         Mockito.when(bizUtil.isAdmin()).thenReturn(true);
         Mockito.when(bizUtil.isUserServiceAdmin(Mockito.any(RangerService.class), Mockito.anyString())).thenReturn(true);
+        Mockito.when(userMgrGrantor.getRolesByLoginId(Mockito.anyString())).thenReturn(Arrays.asList("ROLE_SYS_ADMIN"));
         RESTResponse restResponse;
         try {
             restResponse = serviceREST.secureGrantAccess(serviceName, grantRequestObj, request);