修复权限失效放行并加固证书推送事务和超时回滚

This commit is contained in:
xuans committed 2026-09-15 20:00:38 +08:00
1 parent d74f74b631
commit 05e05a1a23
15 files changed
+861 -178

No files matched your search

+15 -6
View File
@@ -159,8 +159,8 @@ func (s *Server) checkAliyunDNSDomain(c *gin.Context) {
}
func (s *Server) validateDomainAliyunAuthorization(ctx context.Context, domainName string) error {
if s == nil || s.aliyunChecker == nil {
return nil
if s == nil {
return errors.New("域名授权检查服务未初始化")
}
s.configMu.RLock()
setupReady := s.config.SetupReady
@@ -168,13 +168,22 @@ func (s *Server) validateDomainAliyunAuthorization(ctx context.Context, domainNa
credentialRef := strings.TrimSpace(s.config.DNS.CredentialRef)
s.configMu.RUnlock()
if !setupReady || provider != dnsprovider.Aliyun || credentialRef == "" {
if provider != dnsprovider.Aliyun {
return nil
}
if !setupReady {
return errors.New("系统初始化尚未完成,不能验证域名授权")
}
if s.aliyunChecker == nil {
return errors.New("阿里云权限探测器未装载,不能确认域名授权")
}
credentials, err := s.readDNSCredentials(ctx, credentialRef)
if err != nil || len(credentials) == 0 {
return nil
if err != nil {
return fmt.Errorf("读取阿里云 DNS 凭据失败,不能确认域名授权:%w", err)
}
if _, err := dnsprovider.ValidateCredentials(dnsprovider.Aliyun, credentials); err != nil {
return fmt.Errorf("阿里云 DNS 凭据无效,不能确认域名授权:%w", err)
}
if err := s.aliyunChecker.VerifyDomain(ctx, dnsprovider.Aliyun, domainName, credentials); err != nil {
@@ -193,4 +202,4 @@ func (s *Server) readDNSCredentials(ctx context.Context, credentialRef string) (
return nil, errors.New("凭据存储未就绪")
}
return reader.Get(ctx, credentialRef)
}
}
@@ -165,4 +165,57 @@ func TestAliyunScopeAPIsAndDomainValidation(t *testing.T) {
t.Fatalf("阻断提示应包含针对该域名的 RAM 授权指导,got: %s", w.Body.String())
}
}
}
}
func TestAliyunDomainAuthorizationFailsClosed(t *testing.T) {
for _, scenario := range []string{"checker_missing", "reference_missing", "store_missing", "secret_missing", "secret_empty", "secret_incomplete", "setup_incomplete"} {
t.Run(scenario, func(t *testing.T) {
cfg := readyTestConfig(t.TempDir())
cfg.DNS.Provider = dnsprovider.Aliyun
cfg.DNS.CredentialRef = "secret://dns/test"
store := &fakeSecretReaderStore{data: map[string]map[string]string{
cfg.DNS.CredentialRef: {"access_key_id": "test-id", "access_key_secret": "test-secret"},
}}
deps := Dependencies{Config: cfg, Secrets: store, AliyunChecker: &fakeAliyunScopeChecker{allowedZones: []string{"example.com"}}}
switch scenario {
case "checker_missing":
deps.AliyunChecker = nil
case "reference_missing":
deps.Config.DNS.CredentialRef = ""
case "store_missing":
deps.Secrets = nil
case "secret_missing":
store.data = nil
case "secret_empty":
store.data[cfg.DNS.CredentialRef] = nil
case "secret_incomplete":
store.data[cfg.DNS.CredentialRef] = map[string]string{"access_key_id": "test-id"}
case "setup_incomplete":
deps.Config.SetupReady = false
}
server := New(deps)
if err := server.validateDomainAliyunAuthorization(t.Context(), "example.com"); err == nil {
t.Fatal("授权检查依赖异常必须拒绝,不能当作成功")
}
})
}
}
func TestAliyunDomainAPIRejectsPartiallyUnauthorizedSAN(t *testing.T) {
cfg := readyTestConfig(t.TempDir())
cfg.DNS.Provider = dnsprovider.Aliyun
cfg.DNS.CredentialRef = "secret://dns/test"
server := New(Dependencies{
Config: cfg, Repository: &stubDomainRepository{},
Secrets: &fakeSecretReaderStore{data: map[string]map[string]string{
cfg.DNS.CredentialRef: {"access_key_id": "test-id", "access_key_secret": "test-secret"},
}},
AliyunChecker: &fakeAliyunScopeChecker{allowedZones: []string{"example.com"}},
})
w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodPost, "/api/v1/domains", strings.NewReader(`{"name":"example.com","certificate_type":"san","sans":["example.org"]}`))
serveAdminHTTP(server, w, req)
if w.Code != http.StatusBadRequest || !strings.Contains(w.Body.String(), "example.org") {
t.Fatalf("部分 SAN 未授权应整单拒绝:%d %s", w.Code, w.Body.String())
}
}
+7 -1
View File
@@ -463,6 +463,9 @@ func (s *Server) createDomain(c *gin.Context) {
return
}
for _, san := range item.SANs {
if san == item.Name {
continue
}
if err := s.validateDomainAliyunAuthorization(c.Request.Context(), san); err != nil {
s.writeError(c, http.StatusBadRequest, err.Error(), err)
return
@@ -507,6 +510,9 @@ func (s *Server) updateDomain(c *gin.Context) {
return
}
for _, san := range item.SANs {
if san == item.Name {
continue
}
if err := s.validateDomainAliyunAuthorization(c.Request.Context(), san); err != nil {
s.writeError(c, http.StatusBadRequest, err.Error(), err)
return
@@ -789,4 +795,4 @@ func (s *Server) writeError(c *gin.Context, status int, message string, err erro
s.logger.Error(message, "error", err)
}
c.JSON(status, gin.H{"error": message})
}
}