开发检查点:保存项目绑定授权与事务审计源码,待统一测试

This commit is contained in:
xuans committed 2026-09-28 21:33:44 +08:00
1 parent 709c1ef063
commit f38e290b22
10 files changed
+571 -42

No files matched your search

@@ -0,0 +1,69 @@
package httpapi
import (
"context"
"errors"
"net/http"
"time"
"github.com/gin-gonic/gin"
"git.pcux.cn/xuans/Scert/backend/internal/repository"
)
func (s *Server) registerProjectBindingRoutes() {
api := s.router.Group("/api/v1", privateProjectResponse)
api.PUT("/domains/:id/servers", s.projectBindingFailureAudit, s.requireAuthenticated, s.replaceProjectDomainServers)
}
func (s *Server) replaceProjectDomainServers(c *gin.Context) {
if s.projectBindings == nil {
s.writeError(c, http.StatusServiceUnavailable, "项目绑定服务尚未就绪", nil)
return
}
var input struct {
ServerIDs *[]string `json:"server_ids"`
}
if !validMemberIdentifier(c.Param("id")) || c.Request.URL.RawQuery != "" ||
bindJSON(c, &input, jsonRequestBodyLimit) != nil || input.ServerIDs == nil || len(*input.ServerIDs) > repository.MaxProjectBindingServers {
s.writeError(c, http.StatusBadRequest, repository.ErrProjectBindingInput.Error(), nil)
return
}
for _, id := range *input.ServerIDs {
if !validMemberIdentifier(id) {
s.writeError(c, http.StatusBadRequest, repository.ErrProjectBindingInput.Error(), nil)
return
}
}
items, err := s.projectBindings.ReplaceProjectDomainServers(c.Request.Context(), c.GetString(authenticatedActorKey), c.Param("id"), *input.ServerIDs)
switch {
case errors.Is(err, repository.ErrProjectAccessDenied):
s.writeError(c, http.StatusForbidden, "无权修改此项目的服务器绑定", nil)
case errors.Is(err, repository.ErrProjectBindingInput):
s.writeError(c, http.StatusBadRequest, err.Error(), nil)
case err != nil:
s.writeError(c, http.StatusInternalServerError, "保存项目服务器绑定失败,请刷新后核对", nil)
default:
c.JSON(http.StatusOK, gin.H{"items": items})
}
}
func (s *Server) projectBindingFailureAudit(c *gin.Context) {
c.Next()
if c.Writer.Status() < 400 || s.projectBindings == nil {
return
}
domainID := c.Param("id")
if !validMemberIdentifier(domainID) {
domainID = ""
}
ctx, cancel := context.WithTimeout(context.WithoutCancel(c.Request.Context()), 3*time.Second)
defer cancel()
err := s.projectBindings.RecordProjectBindingFailure(ctx, repository.ProjectBindingFailure{
ActorID: c.GetString(authenticatedActorKey), DomainID: domainID,
StatusCode: c.Writer.Status(), RequestID: requestIDFromContext(c),
})
if err != nil && s.logger != nil {
s.logger.Error("项目绑定失败审计未保存", "request_id", requestIDFromContext(c), "status", c.Writer.Status())
}
}
@@ -0,0 +1,140 @@
package httpapi
import (
"context"
"net/http"
"net/http/httptest"
"strings"
"testing"
"git.pcux.cn/xuans/Scert/backend/internal/deployment"
"git.pcux.cn/xuans/Scert/backend/internal/domain"
"git.pcux.cn/xuans/Scert/backend/internal/repository"
)
func TestProjectBindingAPIPermissionsAndExplicitClear(t *testing.T) {
f, _ := newProjectResourceAPIFixture(t)
path := "/api/v1/domains/domain-a/servers"
for _, tc := range []struct {
actor string
code int
}{
{"manager", 200}, {"primary-super-admin", 200}, {"viewer", 403}, {"global-admin", 403}, {"target", 403},
} {
response := serveUserRequest(f.server, f.cookies[tc.actor], http.MethodPut, path, `{"server_ids":["server-a","server-a"]}`)
if response.Code != tc.code || response.Header().Get("Cache-Control") != "private, no-store" {
t.Fatalf("绑定权限或缓存错误:%s,%d,%s", tc.actor, response.Code, response.Body.String())
}
entry := f.lastAudit(t)
if entry.Action != "domain.servers.replace" || entry.ProjectID != "project-a" || entry.OperatorID != tc.actor || strings.Contains(entry.Message, "server_ids") {
t.Fatalf("绑定审计不正确或包含请求体:%+v", entry)
}
}
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodPut, path, `{"server_ids":[]}`)
if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), `"items":[]`) {
t.Fatalf("清空响应错误:%d,%s", response.Code, response.Body.String())
}
items, err := f.server.servers.ListServersByDomainID(t.Context(), "domain-a")
if err != nil || len(items) != 0 {
t.Fatalf("绑定未清空:%+v,%v", items, err)
}
}
func TestProjectBindingAPIRejectsForgeryAndKeepsOldBindings(t *testing.T) {
f, _ := newProjectResourceAPIFixture(t)
for _, tc := range []struct {
id, query, body string
code int
}{
{"domain-a", "", `{}`, 400},
{"domain-a", "", `{"server_ids":null}`, 400},
{"domain-a", "", `{"server_ids":[],"project_id":"project-b"}`, 400},
{"domain-a", "?actor_id=primary-super-admin", `{"server_ids":[]}`, 400},
{"domain-a", "", `{"server_ids":["../server"]}`, 400},
{"domain-a", "", `{"server_ids":["server-b"]}`, 403},
{"domain-a", "", `{"server_ids":["missing"]}`, 403},
{"domain-b", "", `{"server_ids":[]}`, 403},
{"missing", "", `{"server_ids":[]}`, 403},
} {
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodPut, "/api/v1/domains/"+tc.id+"/servers"+tc.query, tc.body)
if response.Code != tc.code {
t.Fatalf("无效或越权请求未拒绝:%s,%d,%s", tc.id, response.Code, response.Body.String())
}
items, err := f.server.servers.ListServersByDomainID(t.Context(), "domain-a")
if err != nil || len(items) != 1 || items[0].ID != "server-a" {
t.Fatalf("拒绝请求改变了原绑定:%+v,%v", items, err)
}
entry := f.lastAudit(t)
wantProject := "project-a"
if tc.id == "domain-b" {
wantProject = "project-b"
} else if tc.id == "missing" {
wantProject = ""
}
if entry.ProjectID != wantProject || entry.OperatorID != "manager" || entry.Status != "failed" {
t.Fatalf("失败审计未按真实资源归属记录:%+v", entry)
}
}
}
type bindingWriteBoundary struct {
repository.ProjectBindingRepository
before func()
}
func (b bindingWriteBoundary) ReplaceProjectDomainServers(ctx context.Context, actor, id string, ids []string) ([]deployment.Server, error) {
b.before()
return b.ProjectBindingRepository.ReplaceProjectDomainServers(ctx, actor, id, ids)
}
func TestProjectBindingAPIRechecksAfterSessionAndFailsClosed(t *testing.T) {
for _, mode := range []string{"revoke", "disable", "missing_dependency"} {
t.Run(mode, func(t *testing.T) {
f, _ := newProjectResourceAPIFixture(t)
f.server.projectBindings = bindingWriteBoundary{ProjectBindingRepository: f.members, before: func() {
if mode == "revoke" {
if err := f.members.RevokeProjectRole(t.Context(), "primary-super-admin", "project-a", "manager", domain.ProjectRoleAdmin); err != nil {
t.Fatal(err)
}
} else if _, err := f.db.ExecContext(t.Context(), `UPDATE users SET status='disabled' WHERE id='manager'`); err != nil {
t.Fatal(err)
}
}}
want := http.StatusForbidden
if mode == "missing_dependency" {
f.server.projectBindings = nil
want = http.StatusServiceUnavailable
}
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodPut, "/api/v1/domains/domain-a/servers", `{"server_ids":[]}`)
if response.Code != want {
t.Fatalf("会话后撤权或缺少依赖未拒绝:%d,%s", response.Code, response.Body.String())
}
items, err := f.server.servers.ListServersByDomainID(t.Context(), "domain-a")
if err != nil || len(items) != 1 {
t.Fatalf("失败后丢失原绑定:%+v,%v", items, err)
}
})
}
}
func TestProjectBindingAPIAuthenticationAndOrigin(t *testing.T) {
f, _ := newProjectResourceAPIFixture(t)
for _, authenticated := range []bool{false, true} {
request := httptest.NewRequest(http.MethodPut, "/api/v1/domains/domain-a/servers", strings.NewReader(`{"server_ids":[]}`))
request.Header.Set("Content-Type", "application/json")
want := http.StatusUnauthorized
if authenticated {
request.AddCookie(f.cookies["manager"])
request.Header.Set("Origin", "https://foreign.example.test")
want = http.StatusForbidden
}
response := httptest.NewRecorder()
f.server.Handler().ServeHTTP(response, request)
if response.Code != want || response.Header().Get("Cache-Control") != "private, no-store" {
t.Fatalf("未登录或跨来源未拒绝:%d,%s", response.Code, response.Body.String())
}
if entry := f.lastAudit(t); entry.Status != "failed" || entry.Action != "domain.servers.replace" {
t.Fatalf("认证失败缺少审计:%+v", entry)
}
}
}
@@ -50,7 +50,7 @@ func newProjectMemberAPIFixture(t *testing.T) projectMemberAPIFixture {
}
f.server = New(Dependencies{
Config: cfg, Users: users, ProjectMembers: f.members, ProjectDirectory: f.members,
ProjectLifecycle: f.members, ProjectResources: f.members, Audit: f.audit,
ProjectLifecycle: f.members, ProjectResources: f.members, ProjectBindings: f.members, Audit: f.audit,
})
for _, account := range []struct{ id, role string }{
{"primary-super-admin", repository.UserRoleSuperAdmin}, {"manager", repository.UserRoleUser},
+4 -38
View File
@@ -52,6 +52,7 @@ type Dependencies struct {
ProjectDirectory repository.ProjectDirectoryRepository
ProjectLifecycle repository.ProjectLifecycleRepository
ProjectResources repository.ProjectResourceReader
ProjectBindings repository.ProjectBindingRepository
SSHKeys *sshkey.Service
DeploymentFactory deployment.ClientFactory
SetupDNS setupDNSVerifier
@@ -87,6 +88,7 @@ type Server struct {
projectDirectory repository.ProjectDirectoryRepository
projectLifecycle repository.ProjectLifecycleRepository
projectResources repository.ProjectResourceReader
projectBindings repository.ProjectBindingRepository
sshKeys *sshkey.Service
deploymentFactory deployment.ClientFactory
setupDNS setupDNSVerifier
@@ -151,6 +153,7 @@ func New(deps Dependencies) *Server {
projectDirectory: deps.ProjectDirectory,
projectLifecycle: deps.ProjectLifecycle,
projectResources: deps.ProjectResources,
projectBindings: deps.ProjectBindings,
sshKeys: deps.SSHKeys,
deploymentFactory: deps.DeploymentFactory,
issueCertificate: deps.IssueCertificate,
@@ -201,6 +204,7 @@ func (s *Server) registerRoutes() {
s.registerProjectMemberRoutes()
s.registerProjectLifecycleRoutes()
s.registerProjectResourceRoutes()
s.registerProjectBindingRoutes()
s.router.GET("/api/v1/projects", privateProjectResponse, s.requireAuthenticated, s.listVisibleProjects)
adminAPI.POST("/domains", s.dnsOperation, s.createDomain)
adminAPI.PUT("/domains/:id", s.dnsOperation, s.updateDomain)
@@ -222,7 +226,6 @@ func (s *Server) registerRoutes() {
adminAPI.POST("/domains/:id/certificate/validate", s.longOperation(certificateTaskTimeout), s.validateCertificate)
adminAPI.POST("/domains/:id/deploy", s.longOperation(certificateTaskTimeout), s.deployCertificateCurrent)
adminAPI.POST("/domains/:id/certificate/versions/:version/restore", s.longOperation(certificateTaskTimeout), s.restoreCertificateVersion)
adminAPI.PUT("/domains/:id/servers", s.replaceDomainServers)
adminAPI.POST("/servers", s.createServer)
adminAPI.PUT("/servers/:id", s.updateServer)
adminAPI.DELETE("/servers/:id", s.deleteServer)
@@ -402,10 +405,6 @@ type serverRequest struct {
ReloadCommand []string `json:"reload_command"`
}
type domainServersRequest struct {
ServerIDs []string `json:"server_ids"`
}
func (s *Server) health(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"status": "ok", "service": "scert"})
}
@@ -964,39 +963,6 @@ func (s *Server) listDomainServers(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"items": items})
}
func (s *Server) replaceDomainServers(c *gin.Context) {
if !s.requireDomainRepository(c) {
return
}
if s.servers == nil {
s.writeError(c, http.StatusNotImplemented, "服务器管理接口尚未配置", errors.New("服务器仓储未配置"))
return
}
if _, err := s.repository.GetByID(c.Request.Context(), c.Param("id")); err != nil {
if repository.IsNotFound(err) {
s.writeError(c, http.StatusNotFound, "域名不存在", err)
return
}
s.writeError(c, http.StatusInternalServerError, "读取域名失败", err)
return
}
var request domainServersRequest
if err := bindJSON(c, &request, jsonRequestBodyLimit); err != nil {
s.writeError(c, http.StatusBadRequest, "请求参数无效", err)
return
}
if err := s.servers.ReplaceDomainServers(c.Request.Context(), c.Param("id"), request.ServerIDs); err != nil {
s.writeError(c, serverErrorStatus(err), "保存域名部署服务器失败", err)
return
}
items, err := s.servers.ListServersByDomainID(c.Request.Context(), c.Param("id"))
if err != nil {
s.writeError(c, http.StatusInternalServerError, "读取域名部署服务器失败", err)
return
}
c.JSON(http.StatusOK, gin.H{"items": items})
}
func serverFromRequest(request serverRequest) deployment.Server {
return deployment.Server{
ID: domain.NewID(), Name: request.Name, Address: request.Address, Port: request.Port,