完善域名服务器多对多关联
新增服务器反向读取托管域名接口,补充多对多关联回归测试与管理页面展示,并更新整改进度清单。
This commit is contained in:
1 parent
cf2df5ee66
commit
35c9d7760c
13 files changed
+175
-2
No files matched your search
@@ -44,6 +44,24 @@ func TestProjectBindingAPIManyToManyAndPathConflict(t *testing.T) {
|
||||
t.Fatalf("冲突提示不明确或泄露其他域名:%s", response.Body.String())
|
||||
}
|
||||
}
|
||||
assertServerDomains := func(id string, expected []string) {
|
||||
t.Helper()
|
||||
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodGet, "/api/v1/servers/"+id+"/domains", "")
|
||||
var result struct {
|
||||
Items []domain.Domain `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)
|
||||
}
|
||||
}
|
||||
assertBindings := func(id string, expected []string) {
|
||||
t.Helper()
|
||||
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodGet, "/api/v1/domains/"+id+"/servers", "")
|
||||
@@ -67,9 +85,13 @@ func TestProjectBindingAPIManyToManyAndPathConflict(t *testing.T) {
|
||||
put("domain-c", `{"server_ids":["server-a","server-c"]}`, http.StatusOK)
|
||||
assertBindings("domain-a", both)
|
||||
assertBindings("domain-c", both)
|
||||
assertServerDomains("server-a", []string{"domain-a", "domain-c"})
|
||||
assertServerDomains("server-c", []string{"domain-a", "domain-c"})
|
||||
put("domain-a", `{"server_ids":["server-c"]}`, http.StatusOK)
|
||||
assertBindings("domain-a", both[1:])
|
||||
assertBindings("domain-c", both)
|
||||
assertServerDomains("server-a", []string{"domain-c"})
|
||||
assertServerDomains("server-c", []string{"domain-a", "domain-c"})
|
||||
put("domain-a", `{"server_ids":[]}`, http.StatusOK)
|
||||
assertBindings("domain-a", []string{})
|
||||
assertBindings("domain-c", both)
|
||||
|
||||
@@ -16,6 +16,7 @@ func (s *Server) registerProjectResourceRoutes() {
|
||||
api.GET("/audit-logs", s.listAuditLogs)
|
||||
api.GET("/servers", s.listServers)
|
||||
api.GET("/servers/:id", s.getServer)
|
||||
api.GET("/servers/:id/domains", s.listServerDomains)
|
||||
api.GET("/domains/:id/servers", s.listDomainServers)
|
||||
api.GET("/certificates", s.listCertificates)
|
||||
api.GET("/certificates/:id", s.getCertificate)
|
||||
|
||||
@@ -98,6 +98,7 @@ func TestProjectResourceAPIDetailsHideExistenceAndGateFiles(t *testing.T) {
|
||||
"/api/v1/certificates/domain-" + suffix,
|
||||
"/api/v1/domains/domain-" + suffix + "/certificate/versions",
|
||||
"/api/v1/domains/domain-" + suffix + "/servers",
|
||||
"/api/v1/servers/server-" + suffix + "/domains",
|
||||
} {
|
||||
reader.reads = nil
|
||||
response := serveUserRequest(f.server, f.cookies["viewer"], http.MethodGet, path, "")
|
||||
@@ -152,6 +153,7 @@ func TestProjectResourceAPIMissingDependencyFailsClosed(t *testing.T) {
|
||||
for _, path := range []string{
|
||||
"/api/v1/domains", "/api/v1/servers", "/api/v1/servers/server-a", "/api/v1/certificates",
|
||||
"/api/v1/certificates/domain-a", "/api/v1/domains/domain-a/certificate/versions", "/api/v1/domains/domain-a/servers",
|
||||
"/api/v1/servers/server-a/domains",
|
||||
} {
|
||||
response := serveUserRequest(f.server, f.cookies["primary-super-admin"], http.MethodGet, path, "")
|
||||
if response.Code != http.StatusServiceUnavailable || len(reader.reads) != 0 {
|
||||
|
||||
@@ -1069,6 +1069,18 @@ func (s *Server) listDomainServers(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"items": items})
|
||||
}
|
||||
|
||||
func (s *Server) listServerDomains(c *gin.Context) {
|
||||
if !s.requireProjectResourceReader(c) {
|
||||
return
|
||||
}
|
||||
items, err := s.projectResources.ListVisibleServerDomains(c.Request.Context(), c.GetString(authenticatedActorKey), c.Param("id"))
|
||||
if err != nil {
|
||||
s.writeProjectResourceError(c, 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,
|
||||
|
||||
@@ -65,6 +65,19 @@ func (r projectResourceReaderStub) ListVisibleDomainServers(ctx context.Context,
|
||||
return r.servers.ListServersByDomainID(ctx, id)
|
||||
}
|
||||
|
||||
func (r projectResourceReaderStub) ListVisibleServerDomains(ctx context.Context, _ string, id string) ([]domain.Domain, error) {
|
||||
servers, err := r.servers.ListServers(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, server := range servers {
|
||||
if server.ID == id {
|
||||
return []domain.Domain{}, nil
|
||||
}
|
||||
}
|
||||
return nil, repository.ErrProjectAccessDenied
|
||||
}
|
||||
|
||||
func readyTestConfig(directory string) config.Config {
|
||||
cfg := config.Default(directory)
|
||||
// Linux 默认目录属于正式安装,测试必须显式隔离所有可写路径。
|
||||
|
||||
@@ -18,6 +18,7 @@ type ProjectResourceReader interface {
|
||||
ListVisibleServers(context.Context, string) ([]deployment.Server, error)
|
||||
GetVisibleServer(context.Context, string, string) (deployment.Server, error)
|
||||
ListVisibleDomainServers(context.Context, string, string) ([]deployment.Server, error)
|
||||
ListVisibleServerDomains(context.Context, string, string) ([]domain.Domain, error)
|
||||
}
|
||||
|
||||
var _ ProjectResourceReader = (*SQLProjectMemberRepository)(nil)
|
||||
@@ -142,6 +143,36 @@ func (r *SQLProjectMemberRepository) ListVisibleDomainServers(ctx context.Contex
|
||||
WHERE `+domainPredicate+` AND `+serverPredicate+` AND domains.id = ? ORDER BY servers.name, servers.id`, args)
|
||||
}
|
||||
|
||||
func (r *SQLProjectMemberRepository) ListVisibleServerDomains(ctx context.Context, actorID, serverID string) ([]domain.Domain, error) {
|
||||
if _, err := r.GetVisibleServer(ctx, actorID, serverID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
domainPredicate, args := resourceReadPredicate("domains.project_id", actorID, domain.PermissionCertificateRead)
|
||||
serverPredicate, serverArgs := resourceReadPredicate("servers.project_id", actorID, domain.PermissionServerRead)
|
||||
args = append(args, serverArgs...)
|
||||
args = append(args, serverID)
|
||||
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, visibleDomainSelect+`
|
||||
JOIN domain_servers visible_binding ON visible_binding.domain_id = domains.id
|
||||
JOIN servers ON servers.id = visible_binding.server_id AND servers.project_id = domains.project_id
|
||||
WHERE `+domainPredicate+` AND `+serverPredicate+` AND servers.id = ? ORDER BY domains.name, domains.id`), args...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to query visible server domains: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
items := make([]domain.Domain, 0)
|
||||
for rows.Next() {
|
||||
item, err := scanDomain(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, item)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("failed to read visible server domains: %w", err)
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *SQLProjectMemberRepository) readVisibleServers(ctx context.Context, query string, args []any) ([]deployment.Server, error) {
|
||||
rows, err := r.db.QueryContext(ctx, Rebind(r.driver, query), args...)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user