Fix public ACL being visible in other clusters (#493)

* Fix public ACL being visible to other cluster's namespace * Fix unit tests
michelin · Dec 9, 2024 · 36987ac · 36987ac
1 parent 85591e4
commit 36987ac
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 15 deletions.
diff --git a/src/main/java/com/michelin/ns4kafka/service/AclService.java b/src/main/java/com/michelin/ns4kafka/service/AclService.java
@@ -255,7 +255,7 @@ public void delete(AccessControlEntry accessControlEntry) {
      * @return A list of ACLs
      */
     public List<AccessControlEntry> findAllGrantedToNamespace(Namespace namespace) {
-        return accessControlEntryRepository.findAll()
+        return findAllForCluster(namespace.getMetadata().getCluster())
             .stream()
             .filter(acl -> acl.getSpec().getGrantedTo().equals(namespace.getMetadata().getName())
                 || acl.getSpec().getGrantedTo().equals(PUBLIC_GRANTED_TO))
@@ -269,7 +269,7 @@ public List<AccessControlEntry> findAllGrantedToNamespace(Namespace namespace) {
      * @return A list of ACLs
      */
     public List<AccessControlEntry> findAllGrantedByNamespace(Namespace namespace) {
-        return accessControlEntryRepository.findAll()
+        return findAllForCluster(namespace.getMetadata().getCluster())
             .stream()
             .filter(acl -> acl.getMetadata().getNamespace().equals(namespace.getMetadata().getName()))
             .toList();
@@ -282,7 +282,7 @@ public List<AccessControlEntry> findAllGrantedByNamespace(Namespace namespace) {
      * @return A list of ACLs
      */
     public List<AccessControlEntry> findAllGrantedByNamespaceToOthers(Namespace namespace) {
-        return accessControlEntryRepository.findAll()
+        return findAllForCluster(namespace.getMetadata().getCluster())
             .stream()
             .filter(acl -> acl.getMetadata().getNamespace().equals(namespace.getMetadata().getName()))
             .filter(acl -> !acl.getSpec().getGrantedTo().equals(namespace.getMetadata().getName()))
@@ -296,7 +296,7 @@ public List<AccessControlEntry> findAllGrantedByNamespaceToOthers(Namespace name
      * @return A list of ACLs
      */
     public List<AccessControlEntry> findAllRelatedToNamespace(Namespace namespace) {
-        return accessControlEntryRepository.findAll()
+        return findAllForCluster(namespace.getMetadata().getCluster())
             .stream()
             .filter(acl -> acl.getMetadata().getNamespace().equals(namespace.getMetadata().getName())
                 || acl.getSpec().getGrantedTo().equals(namespace.getMetadata().getName())
@@ -374,7 +374,7 @@ public List<AccessControlEntry> findAllRelatedToNamespaceByWildcardName(Namespac
      */
     public List<AccessControlEntry> findResourceOwnerGrantedToNamespace(Namespace namespace,
                                                                         AccessControlEntry.ResourceType resourceType) {
-        return accessControlEntryRepository.findAll()
+        return findAllForCluster(namespace.getMetadata().getCluster())
             .stream()
             .filter(acl -> acl.getSpec().getGrantedTo().equals(namespace.getMetadata().getName())
                 && acl.getSpec().getPermission() == AccessControlEntry.Permission.OWNER
@@ -401,7 +401,8 @@ public List<AccessControlEntry> findAllPublicGrantedTo() {
      * @return A list of ACLs
      */
     public List<AccessControlEntry> findAllForNamespace(Namespace namespace) {
-        return accessControlEntryRepository.findAll().stream()
+        return findAllForCluster(namespace.getMetadata().getCluster())
+            .stream()
             .filter(accessControlEntry -> accessControlEntry.getMetadata().getNamespace()
                 .equals(namespace.getMetadata().getName()))
             .toList();