RANGER-4691: updated GDS validation to allow dataset admins to create…

… DatashareInDataset with REQUESTED status Signed-off-by: Madhan Neethiraj <madhan@apache.org>
apache · Feb 8, 2024 · fa1532e · fa1532e
1 parent 834c211
commit fa1532e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java b/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
@@ -411,9 +411,6 @@ public void validateCreate(RangerDataShareInDataset dshid) {
         }
 
         if (dataShare != null && dataset != null && !dataProvider.isAdminUser()) {
-            if (!dataProvider.isServiceAdmin(dataShare.getService()) && !dataProvider.isZoneAdmin(dataShare.getZone())) {
-                validateAdmin(dataProvider.getCurrentUserLoginId(), "dataShare", dataShare.getName(), dataShare.getAcl(), result);
-            }
 
             switch (dshid.getStatus()) {
                 case GRANTED:
@@ -426,8 +423,11 @@ public void validateCreate(RangerDataShareInDataset dshid) {
                     validateAdmin(dataProvider.getCurrentUserLoginId(), "dataset", dataset.getName(), dataset.getAcl(), result);
                 break;
 
-                case NONE:
                 case REQUESTED:
+                    validateAdmin(dataProvider.getCurrentUserLoginId(), "dataset", dataset.getName(), dataset.getAcl(), result);
+                break;
+
+                case NONE:
                 default:
                 break;
             }