fix bugs in DefaultMirrorAccessController

line · Jan 21, 2025 · 5cae78a · 5cae78a
1 parent e81bdc3
commit 5cae78a
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.../java/com/linecorp/centraldogma/server/internal/mirror/DefaultMirrorAccessController.java b/.../java/com/linecorp/centraldogma/server/internal/mirror/DefaultMirrorAccessController.java
@@ -114,8 +114,7 @@ public CompletableFuture<Boolean> isAllowed(String repoUri) {
                        .collect(toImmutableList());
             for (HasRevision<MirrorAccessControl> entity : sorted) {
                 try {
-                    if (repoUri.equals(entity.object().targetPattern()) ||
-                        repoUri.matches(entity.object().targetPattern())) {
+                    if (matchesRepoUri(repoUri, entity)) {
                         return entity.object().allow();
                     }
                 } catch (Exception e) {
@@ -142,9 +141,9 @@ public CompletableFuture<Map<String, Boolean>> isAllowed(Iterable<String> repoUr
                     acl.stream()
                        .sorted(AccessControlComparator.INSTANCE)
                        .collect(toImmutableList());
-            return Streams.stream(repoUris).collect(toImmutableMap(uri -> uri, uri -> {
+            return Streams.stream(repoUris).distinct().collect(toImmutableMap(uri -> uri, uri -> {
                 for (HasRevision<MirrorAccessControl> entity : sorted) {
-                    if (uri.matches(entity.object().targetPattern())) {
+                    if (matchesRepoUri(uri, entity)) {
                         return entity.object().allow();
                     }
                 }
@@ -154,6 +153,16 @@ public CompletableFuture<Map<String, Boolean>> isAllowed(Iterable<String> repoUr
         });
     }
 
+    private static boolean matchesRepoUri(String repoUri, HasRevision<MirrorAccessControl> entity) {
+        final String targetPattern = entity.object().targetPattern();
+        try {
+            return repoUri.equals(targetPattern) || repoUri.matches(targetPattern);
+        } catch (Exception e) {
+            logger.warn("Failed to match the target pattern: {}", targetPattern, e);
+            return false;
+        }
+    }
+
     public CompletableFuture<Void> delete(String id, Author author) {
         return repository().delete(id, author, "Delete '" + id + '\'')
                            .thenAccept(unused -> {