diff --git a/api/src/main/java/io/kafbat/ui/service/rbac/AccessControlService.java b/api/src/main/java/io/kafbat/ui/service/rbac/AccessControlService.java index 7fe3782b3..896bbf875 100644 --- a/api/src/main/java/io/kafbat/ui/service/rbac/AccessControlService.java +++ b/api/src/main/java/io/kafbat/ui/service/rbac/AccessControlService.java @@ -113,11 +113,11 @@ private boolean isAccessible(AuthenticatedUser user, AccessContext context) { return context.isAccessible(getUserPermissions(user, context.cluster())); } - private List getUserPermissions(AuthenticatedUser user, String clusterName) { + private List getUserPermissions(AuthenticatedUser user, @Nullable String clusterName) { return properties.getRoles() .stream() .filter(filterRole(user)) - .filter(role -> role.getClusters().stream().anyMatch(clusterName::equalsIgnoreCase)) + .filter(role -> clusterName == null || role.getClusters().stream().anyMatch(clusterName::equalsIgnoreCase)) .flatMap(role -> role.getPermissions().stream()) .toList(); }