完善域名服务器多对多关联与共享路径预检,补齐回归源码及进度文档
支持同项目内域名与服务器双向复用,局部修改和清空不影响其他域名;在绑定保存、服务器编辑和部署前拒绝已知共享路径冲突。 新增仓储、接口、工作流与页面回归源码,同步任务状态和第三版接口交接。按要求先开发后统一测试,本批未运行测试、构建或部署,保留在途任务与主机别名等待办。
This commit is contained in:
1 parent
f38e290b22
commit
e2200534d3
25 files changed
+740
-41
No files matched your search
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/deployment"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
@@ -41,6 +42,8 @@ func (s *Server) replaceProjectDomainServers(c *gin.Context) {
|
||||
s.writeError(c, http.StatusForbidden, "无权修改此项目的服务器绑定", nil)
|
||||
case errors.Is(err, repository.ErrProjectBindingInput):
|
||||
s.writeError(c, http.StatusBadRequest, err.Error(), nil)
|
||||
case errors.Is(err, deployment.ErrSharedPathConflict):
|
||||
s.writeError(c, http.StatusConflict, deployment.ErrSharedPathConflict.Error(), nil)
|
||||
case err != nil:
|
||||
s.writeError(c, http.StatusInternalServerError, "保存项目服务器绑定失败,请刷新后核对", nil)
|
||||
default:
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"slices"
|
||||
"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 TestProjectBindingAPIManyToManyAndPathConflict(t *testing.T) {
|
||||
f, _ := newProjectResourceAPIFixture(t)
|
||||
server, err := f.server.servers.GetServerByID(t.Context(), "server-a")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server.CertificatePath, server.CertificateChainPath, server.PrivateKeyPath = "", "", ""
|
||||
if err := f.server.servers.UpdateServer(t.Context(), server); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
server.ID, server.Name = "server-c", "第二台共享服务器"
|
||||
if err := f.server.servers.CreateServer(t.Context(), server); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
item, err := domain.NewDomain("second.example.test", domain.CertificateSingle, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
item.ID, item.ProjectID = "domain-c", "project-a"
|
||||
if err := repository.NewSQLDomainRepository(f.db).Create(t.Context(), item); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
put := func(id, body string, expected int) {
|
||||
t.Helper()
|
||||
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodPut, "/api/v1/domains/"+id+"/servers", body)
|
||||
if response.Code != expected {
|
||||
t.Fatalf("多对多保存响应错误:%s,%d,%s", id, response.Code, response.Body.String())
|
||||
}
|
||||
if expected == http.StatusConflict && (!strings.Contains(response.Body.String(), "路径冲突") || strings.Contains(response.Body.String(), "second.example.test")) {
|
||||
t.Fatalf("冲突提示不明确或泄露其他域名:%s", response.Body.String())
|
||||
}
|
||||
}
|
||||
assertBindings := func(id string, expected []string) {
|
||||
t.Helper()
|
||||
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodGet, "/api/v1/domains/"+id+"/servers", "")
|
||||
var result struct {
|
||||
Items []deployment.Server `json:"items"`
|
||||
}
|
||||
if response.Code != http.StatusOK || json.Unmarshal(response.Body.Bytes(), &result) != nil || result.Items == nil {
|
||||
t.Fatalf("多对多读取响应错误:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
ids := make([]string, 0, len(result.Items))
|
||||
for _, item := range result.Items {
|
||||
ids = append(ids, item.ID)
|
||||
}
|
||||
slices.Sort(ids)
|
||||
if !slices.Equal(ids, expected) {
|
||||
t.Fatalf("改变一个域名后关联不正确:%s,%v,期望 %v", id, ids, expected)
|
||||
}
|
||||
}
|
||||
both := []string{"server-a", "server-c"}
|
||||
put("domain-a", `{"server_ids":["server-c","server-a","server-a"]}`, http.StatusOK)
|
||||
put("domain-c", `{"server_ids":["server-a","server-c"]}`, http.StatusOK)
|
||||
assertBindings("domain-a", both)
|
||||
assertBindings("domain-c", both)
|
||||
put("domain-a", `{"server_ids":["server-c"]}`, http.StatusOK)
|
||||
assertBindings("domain-a", both[1:])
|
||||
assertBindings("domain-c", both)
|
||||
put("domain-a", `{"server_ids":[]}`, http.StatusOK)
|
||||
assertBindings("domain-a", []string{})
|
||||
assertBindings("domain-c", both)
|
||||
put("domain-a", `{"server_ids":["server-a","server-c"]}`, http.StatusOK)
|
||||
put("domain-a", `{"server_ids":["server-b"]}`, http.StatusForbidden)
|
||||
assertBindings("domain-a", both)
|
||||
assertBindings("domain-c", both)
|
||||
if _, err := f.db.ExecContext(t.Context(), `UPDATE servers SET certificate_path='/ssl/fixed/cert.pem' WHERE id='server-a'`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
put("domain-a", `{"server_ids":["server-a","server-c"]}`, http.StatusConflict)
|
||||
assertBindings("domain-a", both)
|
||||
assertBindings("domain-c", both)
|
||||
entry := f.lastAudit(t)
|
||||
if entry.Action != "domain.servers.replace" || entry.ProjectID != "project-a" || entry.Status != "failed" {
|
||||
t.Fatalf("路径冲突缺少项目失败审计:%+v", entry)
|
||||
}
|
||||
}
|
||||
@@ -768,6 +768,10 @@ func (s *Server) updateServer(c *gin.Context) {
|
||||
}
|
||||
if err := s.servers.UpdateServer(c.Request.Context(), item); err != nil {
|
||||
cleanup()
|
||||
if errors.Is(err, deployment.ErrSharedPathConflict) {
|
||||
s.writeError(c, http.StatusConflict, deployment.ErrSharedPathConflict.Error(), nil)
|
||||
return
|
||||
}
|
||||
s.writeError(c, serverErrorStatus(err), "更新服务器失败", err)
|
||||
return
|
||||
}
|
||||
@@ -974,6 +978,9 @@ func serverFromRequest(request serverRequest) deployment.Server {
|
||||
}
|
||||
|
||||
func serverErrorStatus(err error) int {
|
||||
if errors.Is(err, deployment.ErrSharedPathConflict) {
|
||||
return http.StatusConflict
|
||||
}
|
||||
if repository.IsConflict(err) {
|
||||
return http.StatusConflict
|
||||
}
|
||||
|
||||
@@ -312,10 +312,15 @@ func TestServerAndDomainAssociationAPI(t *testing.T) {
|
||||
server := New(Dependencies{
|
||||
Config: cfg, Repository: repository.NewSQLDomainRepository(db.DB),
|
||||
Servers: repository.NewSQLServerRepository(db.DB), SSHKeys: sshKeys,
|
||||
ProjectResources: projectResourceReaderStub{
|
||||
domains: repository.NewSQLDomainRepository(db.DB), servers: repository.NewSQLServerRepository(db.DB),
|
||||
},
|
||||
Users: repository.NewSQLUserRepository(db.DB),
|
||||
ProjectResources: repository.NewSQLProjectMemberRepository(db.DB),
|
||||
ProjectBindings: repository.NewSQLProjectMemberRepository(db.DB),
|
||||
})
|
||||
// 此旧格式用例同样使用真实账户与项目成员,不能依赖全局管理员绕过绑定权限。
|
||||
_ = httpUserSessionCookie(server, "test-admin", repository.UserRoleAdmin)
|
||||
if _, err := db.DB.ExecContext(t.Context(), `INSERT INTO project_members (project_id, user_id, role) VALUES ('default', 'test-admin', 'project_admin')`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
domainRequest := httptest.NewRequest(http.MethodPost, "/api/v1/domains", strings.NewReader(`{"name":"example.com","certificate_type":"single"}`))
|
||||
domainRequest.Header.Set("Content-Type", "application/json")
|
||||
|
||||
Reference in new issue
Block a user