RANGER-4286: allow security-zone to exist without any services/resour…

…ces assigned - #2
razorpay · Jun 23, 2023 · 7a7a787 · 7a7a787
1 parent fe7f7b0
commit 7a7a787
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/SecurityZonePredicateUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/SecurityZonePredicateUtil.java
@@ -27,7 +27,6 @@
 import java.util.List;
 
 public class SecurityZonePredicateUtil extends AbstractPredicateUtil {
-
     public SecurityZonePredicateUtil() {
         super();
     }
@@ -107,6 +106,9 @@ public boolean evaluate(Object object) {
     }
 
     private Predicate addPredicateForMatchingZoneName(final String zoneName, List<Predicate> predicates) {
+        if (StringUtils.isEmpty(zoneName)) {
+            return null;
+        }
 
         Predicate ret = new Predicate() {
             @Override
@@ -137,6 +139,9 @@ public boolean evaluate(Object object) {
     }
 
     private Predicate addPredicateForNonMatchingZoneName(final String zoneName, List<Predicate> predicates) {
+        if (StringUtils.isEmpty(zoneName)) {
+            return null;
+        }
 
         Predicate ret = new Predicate() {
             @Override
@@ -150,7 +155,7 @@ public boolean evaluate(Object object) {
                 if(object instanceof RangerSecurityZone) {
                     RangerSecurityZone securityZone = (RangerSecurityZone) object;
 
-                    if (StringUtils.isEmpty(zoneName) || !StringUtils.equals(zoneName, securityZone.getName())) {
+                    if (!StringUtils.equals(zoneName, securityZone.getName())) {
                         ret = true;
                     }
                 }