完善项目入口与成员管理页面并同步真实整改进度
This commit is contained in:
1 parent
af779818fb
commit
a11315ddff
33 files changed
+1757
-29
No files matched your search
@@ -0,0 +1,39 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
// 项目与成员数据属于当前身份,即使认证失败也不能让共享缓存复用响应。
|
||||
func privateProjectResponse(c *gin.Context) {
|
||||
c.Header("Cache-Control", "private, no-store")
|
||||
c.Header("Vary", "Cookie")
|
||||
c.Next()
|
||||
}
|
||||
|
||||
func (s *Server) listVisibleProjects(c *gin.Context) {
|
||||
if s.projectDirectory == nil {
|
||||
s.writeError(c, http.StatusServiceUnavailable, "项目服务尚未就绪", nil)
|
||||
return
|
||||
}
|
||||
query, err := projectMemberPageQuery(c)
|
||||
if err != nil {
|
||||
s.writeError(c, http.StatusBadRequest, "分页参数无效,每页仅支持 5、10、15 或 30 个项目", nil)
|
||||
return
|
||||
}
|
||||
page, err := s.projectDirectory.ListVisibleProjects(c.Request.Context(), c.GetString(authenticatedActorKey), query.After, query.Size)
|
||||
if err != nil {
|
||||
if errors.Is(err, repository.ErrProjectAccessDenied) {
|
||||
s.writeError(c, http.StatusForbidden, "无权读取项目列表", nil)
|
||||
} else {
|
||||
s.writeError(c, http.StatusInternalServerError, "读取项目列表失败,请稍后重试", nil)
|
||||
}
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, page)
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
type projectDirectoryBoundary struct {
|
||||
repository.ProjectDirectoryRepository
|
||||
before func()
|
||||
err error
|
||||
}
|
||||
|
||||
func (r projectDirectoryBoundary) ListVisibleProjects(ctx context.Context, actor, after string, size int) (repository.VisibleProjectPage, error) {
|
||||
if r.before != nil {
|
||||
r.before()
|
||||
}
|
||||
if r.err != nil {
|
||||
return repository.VisibleProjectPage{}, r.err
|
||||
}
|
||||
return r.ProjectDirectoryRepository.ListVisibleProjects(ctx, actor, after, size)
|
||||
}
|
||||
|
||||
func TestProjectDirectoryAPI(t *testing.T) {
|
||||
f := newProjectMemberAPIFixture(t)
|
||||
for _, tc := range []struct {
|
||||
actor string
|
||||
status, count int
|
||||
manage bool
|
||||
}{
|
||||
{"", 401, 0, false}, {"primary-super-admin", 200, 3, true},
|
||||
{"manager", 200, 1, true}, {"viewer", 200, 1, false}, {"global-admin", 200, 0, false},
|
||||
} {
|
||||
t.Run("visibility_"+tc.actor, func(t *testing.T) {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/projects?page_size=5", nil)
|
||||
if tc.actor != "" {
|
||||
req.AddCookie(f.cookies[tc.actor])
|
||||
}
|
||||
response := httptest.NewRecorder()
|
||||
f.server.Handler().ServeHTTP(response, req)
|
||||
if response.Header().Get("Cache-Control") != "private, no-store" || response.Header().Get("Vary") != "Cookie" {
|
||||
t.Fatal("项目响应没有禁止共享缓存")
|
||||
}
|
||||
if response.Code != tc.status {
|
||||
t.Fatalf("项目入口响应错误:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
if tc.status != 200 {
|
||||
return
|
||||
}
|
||||
var page repository.VisibleProjectPage
|
||||
if err := json.Unmarshal(response.Body.Bytes(), &page); err != nil || page.Items == nil || len(page.Items) != tc.count {
|
||||
t.Fatalf("项目响应不正确:%s,%v", response.Body.String(), err)
|
||||
}
|
||||
for _, item := range page.Items {
|
||||
if item.CanManageMembers != tc.manage {
|
||||
t.Fatalf("前端能力提示错误:%+v", item)
|
||||
}
|
||||
}
|
||||
for _, field := range []string{"password", "email", "username", "project_members"} {
|
||||
if strings.Contains(response.Body.String(), field) {
|
||||
t.Fatalf("项目入口包含无关隐私:%s", field)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
for _, query := range []string{"page_size=7", "page_size=5&page_size=10", "after=x&after=y", "actor=primary-super-admin", "after=%00", "page_size=", "page_size=5;after=x"} {
|
||||
t.Run("invalid_"+query, func(t *testing.T) {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/projects?"+query, nil)
|
||||
req.AddCookie(f.cookies["manager"])
|
||||
response := httptest.NewRecorder()
|
||||
f.server.Handler().ServeHTTP(response, req)
|
||||
if response.Code != 400 {
|
||||
t.Fatalf("项目入口接受未知或无效输入:%d", response.Code)
|
||||
}
|
||||
})
|
||||
}
|
||||
for _, size := range []string{"5", "10", "15", "30"} {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/projects?page_size="+size+"&after=zzzz", nil)
|
||||
req.AddCookie(f.cookies["manager"])
|
||||
response := httptest.NewRecorder()
|
||||
f.server.Handler().ServeHTTP(response, req)
|
||||
if response.Code != 200 || !strings.Contains(response.Body.String(), `"items":[]`) {
|
||||
t.Fatalf("支持页长或空页失败:%s", response.Body.String())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestProjectDirectoryAPIBoundaries(t *testing.T) {
|
||||
for _, mode := range []string{"missing_repository", "storage_error", "disabled_after_session", "revoked_after_session"} {
|
||||
t.Run(mode, func(t *testing.T) {
|
||||
f := newProjectMemberAPIFixture(t)
|
||||
status := 200
|
||||
switch mode {
|
||||
case "missing_repository":
|
||||
f.server.projectDirectory = nil
|
||||
status = 503
|
||||
case "storage_error":
|
||||
f.server.projectDirectory = projectDirectoryBoundary{err: errors.New("secret database detail")}
|
||||
status = 500
|
||||
case "disabled_after_session", "revoked_after_session":
|
||||
if mode == "disabled_after_session" {
|
||||
status = 403
|
||||
}
|
||||
f.server.projectDirectory = projectDirectoryBoundary{ProjectDirectoryRepository: f.members, before: func() {
|
||||
query := "DELETE FROM project_members WHERE user_id='manager'"
|
||||
if mode == "disabled_after_session" {
|
||||
query = "UPDATE users SET status='disabled' WHERE id='manager'"
|
||||
}
|
||||
if _, err := f.db.ExecContext(t.Context(), query); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}}
|
||||
}
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/v1/projects", nil)
|
||||
req.AddCookie(f.cookies["manager"])
|
||||
response := httptest.NewRecorder()
|
||||
f.server.Handler().ServeHTTP(response, req)
|
||||
if response.Code != status || strings.Contains(response.Body.String(), "secret database detail") {
|
||||
t.Fatalf("项目入口错误边界失效:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
if mode == "revoked_after_session" && !strings.Contains(response.Body.String(), `"items":[]`) {
|
||||
t.Fatal("会话验证后撤权仍然可见项目")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestProjectMemberAPIPrivateCache(t *testing.T) {
|
||||
f := newProjectMemberAPIFixture(t)
|
||||
for _, actor := range []string{"", "manager", "viewer"} {
|
||||
req := httptest.NewRequest(http.MethodGet, memberTestPath, nil)
|
||||
if actor != "" {
|
||||
req.AddCookie(f.cookies[actor])
|
||||
}
|
||||
response := httptest.NewRecorder()
|
||||
f.server.Handler().ServeHTTP(response, req)
|
||||
if response.Header().Get("Cache-Control") != "private, no-store" || response.Header().Get("Vary") != "Cookie" {
|
||||
t.Fatalf("成员响应允许共享缓存:%s", actor)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,7 @@ import (
|
||||
const projectMemberTargetKey = "project_member_target_id"
|
||||
|
||||
func (s *Server) registerProjectMemberRoutes() {
|
||||
api := s.router.Group("/api/v1/projects/:projectID/members")
|
||||
api := s.router.Group("/api/v1/projects/:projectID/members", privateProjectResponse)
|
||||
api.GET("", s.projectMemberFailureAudit("project_member.list"), s.requireAuthenticated, s.listProjectMembers)
|
||||
api.POST("", s.projectMemberFailureAudit("project_member.grant"), s.requireAuthenticated, s.grantProjectMember)
|
||||
api.DELETE("/:userID/roles/:role", s.projectMemberFailureAudit("project_member.revoke"), s.requireAuthenticated, s.revokeProjectMember)
|
||||
|
||||
@@ -48,7 +48,7 @@ func newProjectMemberAPIFixture(t *testing.T) projectMemberAPIFixture {
|
||||
db: db.DB, members: repository.NewSQLProjectMemberRepository(db.DB, cfg.Database.Driver),
|
||||
audit: repository.NewSQLAuditRepository(db.DB, cfg.Database.Driver), cookies: make(map[string]*http.Cookie),
|
||||
}
|
||||
f.server = New(Dependencies{Config: cfg, Users: users, ProjectMembers: f.members, Audit: f.audit})
|
||||
f.server = New(Dependencies{Config: cfg, Users: users, ProjectMembers: f.members, ProjectDirectory: f.members, Audit: f.audit})
|
||||
for _, account := range []struct{ id, role string }{
|
||||
{"primary-super-admin", repository.UserRoleSuperAdmin}, {"manager", repository.UserRoleUser},
|
||||
{"global-admin", repository.UserRoleAdmin}, {"viewer", repository.UserRoleUser}, {"target", repository.UserRoleUser},
|
||||
|
||||
@@ -49,6 +49,7 @@ type Dependencies struct {
|
||||
Servers repository.ServerRepository
|
||||
Users repository.UserRepository
|
||||
ProjectMembers repository.ProjectMemberRepository
|
||||
ProjectDirectory repository.ProjectDirectoryRepository
|
||||
SSHKeys *sshkey.Service
|
||||
DeploymentFactory deployment.ClientFactory
|
||||
SetupDNS setupDNSVerifier
|
||||
@@ -81,6 +82,7 @@ type Server struct {
|
||||
servers repository.ServerRepository
|
||||
users repository.UserRepository
|
||||
projectMembers repository.ProjectMemberRepository
|
||||
projectDirectory repository.ProjectDirectoryRepository
|
||||
sshKeys *sshkey.Service
|
||||
deploymentFactory deployment.ClientFactory
|
||||
setupDNS setupDNSVerifier
|
||||
@@ -142,6 +144,7 @@ func New(deps Dependencies) *Server {
|
||||
servers: deps.Servers,
|
||||
users: deps.Users,
|
||||
projectMembers: deps.ProjectMembers,
|
||||
projectDirectory: deps.ProjectDirectory,
|
||||
sshKeys: deps.SSHKeys,
|
||||
deploymentFactory: deps.DeploymentFactory,
|
||||
issueCertificate: deps.IssueCertificate,
|
||||
@@ -190,6 +193,7 @@ func (s *Server) registerRoutes() {
|
||||
userAPI.PUT("/:id", s.requireSuperAdmin, s.updateUser)
|
||||
userAPI.DELETE("/:id", s.requireSuperAdmin, s.deleteUser)
|
||||
s.registerProjectMemberRoutes()
|
||||
s.router.GET("/api/v1/projects", privateProjectResponse, s.requireAuthenticated, s.listVisibleProjects)
|
||||
adminAPI.GET("/domains", s.listDomains)
|
||||
adminAPI.POST("/domains", s.dnsOperation, s.createDomain)
|
||||
adminAPI.PUT("/domains/:id", s.dnsOperation, s.updateDomain)
|
||||
|
||||
Reference in new issue
Block a user