From 7000885133b86d133452ece9e93e7d3783cd53bf Mon Sep 17 00:00:00 2001 From: guqing <38999863+guqing@users.noreply.github.com> Date: Fri, 15 Jul 2022 12:23:09 +0800 Subject: [PATCH] refactor: super administrator role has all UI permissions (#2247) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### What type of PR is this? /kind improvement /area core /milestone 2.0 #### What this PR does / why we need it: - 超级管理员具有所有 ui-permissions - 根据用户名获取权限的接口标记非空文档注解 #### Which issue(s) this PR fixes: Fixes # #### Special notes for your reviewer: /cc @halo-dev/sig-halo #### Does this PR introduce a user-facing change? ```release-note None ``` --- .../run/halo/app/core/extension/endpoint/UserEndpoint.java | 7 ++++--- .../java/run/halo/app/security/SuperAdminInitializer.java | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java b/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java index 5ae6895c9..c0b3b7e16 100644 --- a/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java +++ b/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java @@ -7,6 +7,7 @@ import static org.springdoc.core.fn.builders.requestbody.Builder.requestBodyBuil import com.fasterxml.jackson.core.type.TypeReference; import io.micrometer.common.util.StringUtils; import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Map; @@ -148,8 +149,7 @@ public class UserEndpoint implements CustomEndpoint { return list; }) .map(roles -> { - Set uiPermissions = - roles.stream() + Set uiPermissions = roles.stream() .map(role -> role.getMetadata().getAnnotations()) .filter(Objects::nonNull) .map(this::mergeUiPermissions) @@ -180,6 +180,7 @@ public class UserEndpoint implements CustomEndpoint { return result; } - record UserPermission(Set roles, Set uiPermissions) { + record UserPermission(@Schema(required = true) Set roles, + @Schema(required = true) Set uiPermissions) { } } diff --git a/src/main/java/run/halo/app/security/SuperAdminInitializer.java b/src/main/java/run/halo/app/security/SuperAdminInitializer.java index c78d2fe42..fd462a65a 100644 --- a/src/main/java/run/halo/app/security/SuperAdminInitializer.java +++ b/src/main/java/run/halo/app/security/SuperAdminInitializer.java @@ -1,7 +1,9 @@ package run.halo.app.security; import java.time.Instant; +import java.util.HashMap; import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -68,6 +70,9 @@ public class SuperAdminInitializer implements ApplicationListener annotations = new HashMap<>(); + annotations.put(Role.UI_PERMISSIONS_ANNO, "[\"*\"]"); + metadata.setAnnotations(annotations); var superRule = new PolicyRule.Builder() .apiGroups("*")