修复DNS账户跨项目读取并补充撤权与失败隔离回归
This commit is contained in:
1 parent
e060205a4d
commit
2513f935bc
12 files changed
+218
-16
No files matched your search
@@ -9,6 +9,7 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/dnsprovider"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/repository"
|
||||
)
|
||||
|
||||
@@ -28,7 +29,6 @@ type dnsAccountView struct {
|
||||
|
||||
// listDNSAccounts 仅列出当前绑定的配置,不枚举凭据仓库中的临时或历史密钥。
|
||||
func (s *Server) listDNSAccounts(c *gin.Context) {
|
||||
c.Header("Cache-Control", "no-store")
|
||||
s.configMu.RLock()
|
||||
cfg := s.config
|
||||
s.configMu.RUnlock()
|
||||
@@ -37,16 +37,36 @@ func (s *Server) listDNSAccounts(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"items": items})
|
||||
return
|
||||
}
|
||||
projectID := strings.TrimSpace(cfg.DNS.ProjectID)
|
||||
if projectID == "" {
|
||||
projectID = domain.DefaultProjectID
|
||||
}
|
||||
// 在查询账户归属或解密凭据之前,按配置中的真实项目实时判权。
|
||||
// 全局管理员身份不能代替项目授权,撤权后的旧会话也不能继续读取。
|
||||
authorizer, ok := s.projectMembers.(repository.ProjectAuthorizer)
|
||||
if !ok {
|
||||
authorizer, ok = s.projectDomains.(repository.ProjectAuthorizer)
|
||||
}
|
||||
if !ok {
|
||||
s.writeError(c, http.StatusServiceUnavailable, "项目 DNS 权限服务尚未就绪", nil)
|
||||
return
|
||||
}
|
||||
if err := authorizer.AuthorizeProject(c.Request.Context(), c.GetString(authenticatedActorKey), projectID, domain.PermissionDNSRead); err != nil {
|
||||
if errors.Is(err, repository.ErrProjectAccessDenied) {
|
||||
// 列表只返回可见账户,不泄露其他项目是否配置了凭据。
|
||||
c.JSON(http.StatusOK, gin.H{"items": items})
|
||||
return
|
||||
}
|
||||
s.writeError(c, http.StatusServiceUnavailable, "读取项目 DNS 权限失败,请稍后重试", nil)
|
||||
return
|
||||
}
|
||||
item := dnsAccountView{
|
||||
ID: "system-dns", Name: "系统 DNS 账户", Provider: cfg.DNS.Provider,
|
||||
ProjectID: strings.TrimSpace(cfg.DNS.ProjectID),
|
||||
ProjectID: projectID,
|
||||
ProviderName: "未知服务商", AccountIdentifier: "未提供账号标识",
|
||||
OwnerUserID: cfg.DNS.OwnerUserID, OwnerState: "unassigned", OwnerUsername: "未分配",
|
||||
VerificationState: cfg.DNS.VerificationState, CredentialState: "available",
|
||||
}
|
||||
if item.ProjectID == "" {
|
||||
item.ProjectID = "default"
|
||||
}
|
||||
var owner repository.User
|
||||
ownerID := strings.TrimSpace(cfg.DNS.OwnerUserID)
|
||||
if ownerID == "" {
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
func newDNSAccountScopeFixture(t *testing.T) (projectMemberAPIFixture, *fakeSecretReaderStore) {
|
||||
t.Helper()
|
||||
f := newProjectMemberAPIFixture(t)
|
||||
f.server.config.DNS.Provider = "aliyun"
|
||||
f.server.config.DNS.ProjectID = "project-a"
|
||||
f.server.config.DNS.CredentialRef = "secret://dns/scope-test"
|
||||
secrets := &fakeSecretReaderStore{data: map[string]map[string]string{
|
||||
f.server.config.DNS.CredentialRef: {
|
||||
"access_key_id": "test-access-key-1234", "access_key_secret": "test-secret-never-return",
|
||||
},
|
||||
}}
|
||||
f.server.secrets = secrets
|
||||
return f, secrets
|
||||
}
|
||||
|
||||
func TestDNSAccountScopePermissions(t *testing.T) {
|
||||
f, secrets := newDNSAccountScopeFixture(t)
|
||||
for _, tc := range []struct {
|
||||
actor string
|
||||
count int
|
||||
}{
|
||||
{"primary-super-admin", 1}, {"manager", 1}, {"viewer", 1}, {"global-admin", 0}, {"target", 0},
|
||||
} {
|
||||
t.Run(tc.actor, func(t *testing.T) {
|
||||
secrets.getCalls = 0
|
||||
response := serveUserRequest(f.server, f.cookies[tc.actor], http.MethodGet, "/api/v1/dns/accounts", "")
|
||||
var page struct {
|
||||
Items []dnsAccountView `json:"items"`
|
||||
}
|
||||
if response.Code != http.StatusOK || json.Unmarshal(response.Body.Bytes(), &page) != nil || page.Items == nil || len(page.Items) != tc.count {
|
||||
t.Fatalf("DNS 账户项目可见范围错误:%s,%d,%s", tc.actor, response.Code, response.Body.String())
|
||||
}
|
||||
if secrets.getCalls != tc.count {
|
||||
t.Fatalf("无权访问的请求读取了凭据仓库:%s,%d", tc.actor, secrets.getCalls)
|
||||
}
|
||||
if response.Header().Get("Cache-Control") != "private, no-store" || response.Header().Get("Vary") != "Cookie" {
|
||||
t.Fatal("DNS 账户响应缺少身份缓存隔离")
|
||||
}
|
||||
for _, forbidden := range []string{"test-access-key-1234", "test-secret-never-return", "secret://dns/scope-test"} {
|
||||
if strings.Contains(response.Body.String(), forbidden) {
|
||||
t.Fatal("DNS 账户列表泄露完整凭据或内部引用")
|
||||
}
|
||||
}
|
||||
if tc.count == 1 && (page.Items[0].ProjectID != "project-a" || page.Items[0].AccountIdentifier != "test****1234") {
|
||||
t.Fatalf("授权响应丢失真实归属或脱敏标识:%s", response.Body.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
// 请求参数不能冒充其他身份或改变配置中的真实项目归属。
|
||||
f.server.config.DNS.ProjectID = "project-b"
|
||||
secrets.getCalls = 0
|
||||
response := serveUserRequest(f.server, f.cookies["manager"], http.MethodGet, "/api/v1/dns/accounts?project_id=project-a&actor_id=primary-super-admin", "")
|
||||
if response.Code != http.StatusOK || strings.TrimSpace(response.Body.String()) != `{"items":[]}` || secrets.getCalls != 0 {
|
||||
t.Fatalf("跨项目请求没有在读取凭据之前拒绝:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSAccountScopeRevocation(t *testing.T) {
|
||||
f, secrets := newDNSAccountScopeFixture(t)
|
||||
if err := f.members.GrantProjectRole(t.Context(), "primary-super-admin", "project-a", "global-admin", domain.ProjectRoleDNSAdmin); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
response := serveUserRequest(f.server, f.cookies["global-admin"], http.MethodGet, "/api/v1/dns/accounts", "")
|
||||
if response.Code != http.StatusOK || secrets.getCalls != 1 {
|
||||
t.Fatalf("显式授予 DNS 角色后不可读取:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
if err := f.members.RevokeProjectRole(t.Context(), "primary-super-admin", "project-a", "global-admin", domain.ProjectRoleDNSAdmin); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
response = serveUserRequest(f.server, f.cookies["global-admin"], http.MethodGet, "/api/v1/dns/accounts", "")
|
||||
if response.Code != http.StatusOK || strings.TrimSpace(response.Body.String()) != `{"items":[]}` || secrets.getCalls != 1 {
|
||||
t.Fatalf("撤权后原会话仍可读取 DNS 账户:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestDNSAccountScopeDefaultsAndDependencies(t *testing.T) {
|
||||
for _, scenario := range []string{"default", "missing_project", "missing_authorizer", "authorizer_error", "database_error", "anonymous"} {
|
||||
t.Run(scenario, func(t *testing.T) {
|
||||
f, secrets := newDNSAccountScopeFixture(t)
|
||||
cookie := f.cookies["primary-super-admin"]
|
||||
want := http.StatusOK
|
||||
switch scenario {
|
||||
case "default":
|
||||
f.server.config.DNS.ProjectID = " "
|
||||
case "missing_project":
|
||||
f.server.config.DNS.ProjectID = "missing"
|
||||
case "missing_authorizer":
|
||||
f.server.projectMembers, f.server.projectDomains = nil, nil
|
||||
want = http.StatusServiceUnavailable
|
||||
case "authorizer_error":
|
||||
f.server.projectMembers = nil
|
||||
f.server.projectDomains = projectDomainRepositoryStub{authorizeErr: errors.New("internal-sensitive-diagnostic")}
|
||||
want = http.StatusServiceUnavailable
|
||||
case "database_error":
|
||||
// 认证仍使用正常账户仓储,只让项目授权的数据库读取失败。
|
||||
f.server.projectMembers = nil
|
||||
f.server.projectDomains = projectDomainRepositoryStub{authorize: func(ctx context.Context, actor, project string, permission domain.ProjectPermission) error {
|
||||
if err := f.db.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
return f.members.AuthorizeProject(ctx, actor, project, permission)
|
||||
}}
|
||||
want = http.StatusServiceUnavailable
|
||||
case "anonymous":
|
||||
cookie = nil
|
||||
want = http.StatusUnauthorized
|
||||
}
|
||||
response := serveUserRequest(f.server, cookie, http.MethodGet, "/api/v1/dns/accounts", "")
|
||||
if response.Code != want || response.Header().Get("Cache-Control") != "private, no-store" || response.Header().Get("Vary") != "Cookie" {
|
||||
t.Fatalf("DNS 列表依赖或缓存隔离错误:%d,%s", response.Code, response.Body.String())
|
||||
}
|
||||
if scenario == "default" {
|
||||
if secrets.getCalls != 1 || !strings.Contains(response.Body.String(), `"project_id":"default"`) {
|
||||
t.Fatal("旧配置没有按默认项目授权")
|
||||
}
|
||||
return
|
||||
}
|
||||
if secrets.getCalls != 0 || strings.Contains(response.Body.String(), "project-a") || strings.Contains(response.Body.String(), "internal-sensitive-diagnostic") || strings.Contains(response.Body.String(), "account_identifier") {
|
||||
t.Fatalf("未获可靠授权仍读取凭据或泄露元数据:%s", response.Body.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -91,7 +91,7 @@ func TestAdminDNSAccountsExposeProjectScope(t *testing.T) {
|
||||
secrets := &fakeSecretReaderStore{data: map[string]map[string]string{
|
||||
cfg.DNS.CredentialRef: {"api_token": "test-token"},
|
||||
}}
|
||||
server := New(Dependencies{Config: cfg, Secrets: secrets})
|
||||
server := New(Dependencies{Config: cfg, Secrets: secrets, ProjectDomains: projectDomainRepositoryStub{}})
|
||||
response := httptest.NewRecorder()
|
||||
request := httptest.NewRequest(http.MethodGet, "/api/v1/dns/accounts", nil)
|
||||
serveAdminHTTP(server, response, request)
|
||||
|
||||
@@ -13,6 +13,7 @@ import (
|
||||
func (s *Server) registerProjectResourceRoutes() {
|
||||
api := s.router.Group("/api/v1", privateProjectResponse, s.requireAuthenticated)
|
||||
api.GET("/domains", s.listDomains)
|
||||
api.GET("/dns/accounts", s.listDNSAccounts)
|
||||
api.GET("/audit-logs", s.listAuditLogs)
|
||||
api.GET("/servers", s.listServers)
|
||||
api.GET("/servers/:id", s.getServer)
|
||||
|
||||
@@ -65,10 +65,10 @@ type Dependencies struct {
|
||||
ImportCertificateTask func(context.Context, certificate.ImportRequest) (certificate.IssueResult, deployment.Report, error)
|
||||
DeployCertificate func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
|
||||
// DeployCertificateTask 执行已有任务,不得重复创建任务或尝试记录。
|
||||
DeployCertificateTask func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
|
||||
RestoreCertificateVersion func(context.Context, string, string) (certificate.IssueResult, error)
|
||||
DeployCertificateTask func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
|
||||
RestoreCertificateVersion func(context.Context, string, string) (certificate.IssueResult, error)
|
||||
RestoreCertificateVersionTask func(context.Context, string, string) (certificate.IssueResult, error)
|
||||
ValidateCertificate func(context.Context, string) (certificate.IssueResult, certificate.ValidationResult, error)
|
||||
ValidateCertificate func(context.Context, string) (certificate.IssueResult, certificate.ValidationResult, error)
|
||||
// ValidateCertificateTask 直接校验当前证书,不重复创建任务。
|
||||
ValidateCertificateTask func(context.Context, string) (certificate.IssueResult, certificate.ValidationResult, error)
|
||||
|
||||
@@ -246,7 +246,6 @@ func (s *Server) registerRoutes() {
|
||||
adminAPI.GET("/settings", s.getSettings)
|
||||
adminAPI.PUT("/settings", s.requireSuperAdminSystemConfig, s.updateSettings)
|
||||
adminAPI.GET("/dns/providers", s.listAdminDNSProviders)
|
||||
adminAPI.GET("/dns/accounts", s.listDNSAccounts)
|
||||
adminAPI.POST("/dns/test", s.requireSuperAdminSystemConfig, s.dnsOperation, s.testAdminDNS)
|
||||
adminAPI.POST("/dns/aliyun/check", s.requireSuperAdminSystemConfig, s.dnsOperation, s.checkAliyunDNSDomain)
|
||||
adminAPI.POST("/renewal/run", s.requireSuperAdmin, s.runRenewalNow)
|
||||
|
||||
Reference in new issue
Block a user