完善项目入口与成员管理页面并同步真实整改进度

This commit is contained in:
xuans committed 2026-09-28 19:56:24 +08:00
1 parent af779818fb
commit a11315ddff
33 files changed
+1757 -29

No files matched your search

+3 -2
View File
@@ -155,8 +155,9 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
}, management)
server = httpapi.New(httpapi.Dependencies{
Config: cfg, ConfigPath: configPath, Logger: logger, Repository: repo, Servers: serverRepo, Users: userRepo, SSHKeys: sshKeys, DeploymentFactory: deployment.SSHFactory{Secrets: secretStore},
ProjectMembers: repository.NewSQLProjectMemberRepository(db.DB, runtimeDatabaseConfig.Driver),
SetupDNS: dnsVerification, Secrets: secretStore, Firewall: firewall.NewManager(), AliyunChecker: aliyunAuthChecker,
ProjectMembers: repository.NewSQLProjectMemberRepository(db.DB, runtimeDatabaseConfig.Driver),
ProjectDirectory: repository.NewSQLProjectMemberRepository(db.DB, runtimeDatabaseConfig.Driver),
SetupDNS: dnsVerification, Secrets: secretStore, Firewall: firewall.NewManager(), AliyunChecker: aliyunAuthChecker,
IssueCertificate: workflow.IssueForHTTP,
IssueSetupCertificate: func(ctx context.Context, request certificate.SetupCertificateRequest) (certificate.SavedResource, error) {
return certificates.IssueForSetup(ctx, request)
@@ -32,4 +32,13 @@ func TestApplicationWiresProjectMemberAPI(t *testing.T) {
if listed.Code != http.StatusOK || !strings.Contains(listed.Body.String(), `"items":[]`) {
t.Fatalf("实际应用未接入成员仓储或默认项目隐式增加成员:%d,%s", listed.Code, listed.Body.String())
}
directoryRequest := httptest.NewRequest(http.MethodGet, "/api/v1/projects?page_size=5", nil)
for _, cookie := range response.Result().Cookies() {
directoryRequest.AddCookie(cookie)
}
directoryResponse := httptest.NewRecorder()
application.HTTP.Handler().ServeHTTP(directoryResponse, directoryRequest)
if directoryResponse.Code != http.StatusOK || !strings.Contains(directoryResponse.Body.String(), `"id":"default"`) || !strings.Contains(directoryResponse.Body.String(), `"can_manage_members":true`) {
t.Fatalf("实际应用未接入项目入口:%d,%s", directoryResponse.Code, directoryResponse.Body.String())
}
}
@@ -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},
+4
View File
@@ -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)
@@ -0,0 +1,85 @@
package repository
import (
"context"
"database/sql"
"errors"
"fmt"
)
// ProjectDirectoryRepository 只返回当前有效账户有权读取的项目,不暴露基础仓储的全量列表。
type ProjectDirectoryRepository interface {
ListVisibleProjects(context.Context, string, string, int) (VisibleProjectPage, error)
}
type VisibleProject struct {
ID string `json:"id"`
Name string `json:"name"`
Description string `json:"description"`
CanManageMembers bool `json:"can_manage_members"`
}
type VisibleProjectPage struct {
Items []VisibleProject `json:"items"`
PageSize int `json:"page_size"`
HasMore bool `json:"has_more"`
NextCursor string `json:"next_cursor"`
}
var _ ProjectDirectoryRepository = (*SQLProjectMemberRepository)(nil)
func (r *SQLProjectMemberRepository) ListVisibleProjects(ctx context.Context, actorID, after string, limit int) (VisibleProjectPage, error) {
page := VisibleProjectPage{Items: make([]VisibleProject, 0), PageSize: limit}
if err := r.ensureDB(); err != nil {
return page, err
}
if limit < 1 || limit > 100 || len(after) > 128 {
return page, errors.New("项目分页参数无效")
}
// 授权、可见性过滤与读取共用一条 SQL;有效账户没有项目时仍返回授权门行。
// 使用 EXISTS 避免一个账户的多个角色造成重复项目和错误分页。
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, `SELECT a.id, p.id, p.name, p.description,
CASE WHEN a.role = 'super_admin' OR EXISTS (
SELECT 1 FROM project_members manager WHERE manager.project_id = p.id
AND manager.user_id = a.id AND manager.role = 'project_admin'
) THEN 1 ELSE 0 END
FROM users a LEFT JOIN projects p ON p.id > ? AND (
a.role = 'super_admin' OR EXISTS (
SELECT 1 FROM project_members member WHERE member.project_id = p.id AND member.user_id = a.id
AND member.role IN ('project_admin', 'certificate_admin', 'deployment_admin', 'dns_admin', 'audit_viewer', 'read_only')
)
)
WHERE a.id = ? AND a.status = 'active' AND a.role IN ('super_admin', 'admin', 'user')
ORDER BY p.id LIMIT ?`), after, actorID, limit+1)
if err != nil {
return page, fmt.Errorf("查询可见项目失败:%w", err)
}
defer rows.Close()
allowed := false
for rows.Next() {
var actor string
var id, name, description sql.NullString
var manager int
if err := rows.Scan(&actor, &id, &name, &description, &manager); err != nil {
return page, fmt.Errorf("读取可见项目失败:%w", err)
}
allowed = true
if id.Valid {
page.Items = append(page.Items, VisibleProject{
ID: id.String, Name: name.String, Description: description.String, CanManageMembers: manager == 1,
})
}
}
if err := rows.Err(); err != nil {
return VisibleProjectPage{}, fmt.Errorf("读取可见项目结果失败:%w", err)
}
if !allowed {
return page, ErrProjectAccessDenied
}
if len(page.Items) > limit {
page.Items = page.Items[:limit]
page.HasMore = true
page.NextCursor = page.Items[limit-1].ID
}
return page, nil
}
@@ -0,0 +1,150 @@
package repository
import (
"errors"
"fmt"
"testing"
"git.pcux.cn/xuans/Scert/backend/internal/config"
"git.pcux.cn/xuans/Scert/backend/internal/database"
"git.pcux.cn/xuans/Scert/backend/internal/domain"
"git.pcux.cn/xuans/Scert/backend/internal/testsupport/mysqltest"
)
func TestProjectDirectorySQLite(t *testing.T) {
checkProjectDirectory(t, config.Default(t.TempDir()).Database)
}
func TestProjectDirectoryMySQLReal(t *testing.T) {
server := mysqltest.New(t)
checkProjectDirectory(t, server.Database(t))
}
func checkProjectDirectory(t *testing.T, cfg config.DatabaseConfig) {
t.Helper()
db, err := database.Open(t.Context(), cfg)
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { _ = db.Close() })
if err := database.Migrate(t.Context(), db.DB, cfg.Driver); err != nil {
t.Fatal(err)
}
for _, user := range []struct{ id, role string }{
{"root", "super_admin"}, {"manager", "user"}, {"global-admin", "admin"}, {"viewer", "user"},
} {
if _, err := db.DB.ExecContext(t.Context(), Rebind(cfg.Driver, `INSERT INTO users (id, username, password_hash, role, status)
VALUES (?, ?, 'test-only-no-login', ?, 'active')`), user.id, user.id, user.role); err != nil {
t.Fatal(err)
}
}
projects := NewSQLProjectRepository(db.DB, cfg.Driver)
repo := NewSQLProjectMemberRepository(db.DB, cfg.Driver)
for i := 0; i < 12; i++ {
id := fmt.Sprintf("visible-%02d", i)
if err := projects.CreateProject(t.Context(), domain.Project{ID: id, Name: "测试项目", Description: "项目说明"}); err != nil {
t.Fatal(err)
}
for _, role := range []domain.ProjectRole{domain.ProjectRoleAdmin, domain.ProjectRoleReadOnly} {
if err := repo.GrantProjectRole(t.Context(), "root", id, "manager", role); err != nil {
t.Fatal(err)
}
}
}
if err := repo.GrantProjectRole(t.Context(), "root", "visible-00", "viewer", domain.ProjectRoleReadOnly); err != nil {
t.Fatal(err)
}
t.Run("visible_roles_and_empty_directory", func(t *testing.T) {
for _, tc := range []struct {
actor string
count int
manage bool
}{
{"root", 13, true}, {"manager", 12, true}, {"viewer", 1, false}, {"global-admin", 0, false},
} {
page, err := repo.ListVisibleProjects(t.Context(), tc.actor, "", 30)
if err != nil || page.Items == nil || len(page.Items) != tc.count || page.HasMore || page.NextCursor != "" {
t.Fatalf("项目可见性错误:%s,%+v,%v", tc.actor, page, err)
}
for _, item := range page.Items {
if item.CanManageMembers != tc.manage || (tc.actor != "root" && item.ID == domain.DefaultProjectID) {
t.Fatalf("全局身份被错误映射为项目权限:%s,%+v", tc.actor, item)
}
}
}
})
t.Run("pagination_deduplicates_roles", func(t *testing.T) {
for _, size := range []int{1, 5, 10, 15, 30} {
after := ""
seen := make(map[string]bool)
for attempts := 0; ; attempts++ {
if attempts > 12 {
t.Fatal("项目分页游标没有前进")
}
page, err := repo.ListVisibleProjects(t.Context(), "manager", after, size)
if err != nil || len(page.Items) > size || page.PageSize != size {
t.Fatalf("项目分页无效:%+v,%v", page, err)
}
for _, item := range page.Items {
if seen[item.ID] || item.ID <= after {
t.Fatalf("项目重复或排序错误:%+v", item)
}
seen[item.ID] = true
}
if !page.HasMore {
break
}
if page.NextCursor != page.Items[len(page.Items)-1].ID {
t.Fatal("下一页游标不是最后项目")
}
after = page.NextCursor
}
if len(seen) != 12 {
t.Fatalf("项目被截断或泄露:%d", len(seen))
}
}
page, err := repo.ListVisibleProjects(t.Context(), "manager", "zzzz", 5)
if err != nil || page.Items == nil || len(page.Items) != 0 {
t.Fatalf("有效空页被拒绝:%+v,%v", page, err)
}
})
t.Run("realtime_revocation_and_disabled_accounts", func(t *testing.T) {
if err := repo.RevokeProjectRole(t.Context(), "root", "visible-00", "manager", domain.ProjectRoleAdmin); err != nil {
t.Fatal(err)
}
page, err := repo.ListVisibleProjects(t.Context(), "manager", "", 5)
if err != nil || len(page.Items) == 0 || page.Items[0].CanManageMembers {
t.Fatalf("撤销管理角色未生效:%+v,%v", page, err)
}
if err := repo.RevokeProjectRole(t.Context(), "root", "visible-00", "manager", domain.ProjectRoleReadOnly); err != nil {
t.Fatal(err)
}
page, err = repo.ListVisibleProjects(t.Context(), "manager", "", 5)
if err != nil || len(page.Items) == 0 || page.Items[0].ID == "visible-00" {
t.Fatalf("已离开项目仍可见:%+v,%v", page, err)
}
for _, actor := range []string{"manager", "root"} {
if _, err := db.DB.ExecContext(t.Context(), Rebind(cfg.Driver, "UPDATE users SET status='disabled' WHERE id=?"), actor); err != nil {
t.Fatal(err)
}
if _, err := repo.ListVisibleProjects(t.Context(), actor, "", 5); !errors.Is(err, ErrProjectAccessDenied) {
t.Fatalf("停用账户仍有权限:%v", err)
}
}
for _, actor := range []string{"", "missing"} {
if _, err := repo.ListVisibleProjects(t.Context(), actor, "", 5); !errors.Is(err, ErrProjectAccessDenied) {
t.Fatalf("不存在身份没有被拒绝:%v", err)
}
}
})
t.Run("invalid_limits_and_storage", func(t *testing.T) {
for _, size := range []int{0, -1, 101} {
if _, err := repo.ListVisibleProjects(t.Context(), "viewer", "", size); err == nil {
t.Fatal("接受无效分页")
}
}
if _, err := NewSQLProjectMemberRepository(nil).ListVisibleProjects(t.Context(), "viewer", "", 5); err == nil {
t.Fatal("空数据库被视为成功")
}
})
}