RANGER-4403: security-zone validation updated to prevent duplicate re…

…source entries - #2
apache · Sep 13, 2023 · d4972f7 · d4972f7
1 parent da68108
commit d4972f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...ts-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java b/...ts-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
@@ -57,8 +57,13 @@ public RangerPolicyResourceSignature(RangerPolicy policy) {
 		}
 	}
 
-	public RangerPolicyResourceSignature(Map<String, List<String>> resources) {
-		this(toSignatureString(toPolicyResources(resources)));
+	public RangerPolicyResourceSignature(Map<String, RangerPolicyResource> resources) {
+		this(toSignatureString(resources));
+	}
+
+	// alternate to constructor that takes Map<String, List<String>>
+	public static RangerPolicyResourceSignature from(Map<String, List<String>> resources) {
+		return new RangerPolicyResourceSignature(toPolicyResources(resources));
 	}
 
 

diff --git a/.../src/main/java/org/apache/ranger/plugin/model/validation/RangerSecurityZoneValidator.java b/.../src/main/java/org/apache/ranger/plugin/model/validation/RangerSecurityZoneValidator.java
@@ -507,7 +507,7 @@ private boolean validateSecurityZoneService(String serviceName, RangerSecurityZo
                             }
                         }
 
-                        RangerPolicyResourceSignature resourceSignature = new RangerPolicyResourceSignature(resource);
+                        RangerPolicyResourceSignature resourceSignature = RangerPolicyResourceSignature.from(resource);
 
                         if (!resourceSignatures.add(resourceSignature.getSignature())) {
                             ValidationErrorCode error = ValidationErrorCode.SECURITY_ZONE_VALIDATION_ERR_DUPLICATE_RESOURCE_ENTRY;