增加域名 DNS 账户绑定与引用保护并修复并发冲突分类
This commit is contained in:
1 parent
1dc72f2b44
commit
7a6da6b2c9
25 files changed
+966
-24
No files matched your search
@@ -0,0 +1,24 @@
|
||||
package certificate
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
)
|
||||
|
||||
func TestIndependentDNSAccountNeverFallsBackToSystemCredentials(t *testing.T) {
|
||||
item, err := domain.NewDomain("bound.example.test", domain.CertificateSingle, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
item.DNSAccountID, item.DNSBindingID = "independent-account", "binding"
|
||||
repo := &serviceRepository{item: item}
|
||||
service := NewService(certificateTestConfig(t.TempDir()), repo, nil, nil, serviceAccounts{})
|
||||
if _, err := service.Issue(t.Context(), item.ID); err == nil || !strings.Contains(err.Error(), "执行租约") {
|
||||
t.Fatal("未接入执行租约时不能回退系统凭据", err)
|
||||
}
|
||||
if repo.updateCalls != 0 {
|
||||
t.Fatal("拒绝执行后不应变更域名状态")
|
||||
}
|
||||
}
|
||||
@@ -150,6 +150,10 @@ func (s *Service) Issue(ctx context.Context, domainID string) (IssueResult, erro
|
||||
if err != nil {
|
||||
return IssueResult{}, fmt.Errorf("读取域名配置失败:%w", err)
|
||||
}
|
||||
// 独立账户执行租约接入前禁止退回系统账户,避免配置与实际用证账户不一致。
|
||||
if item.DNSAccountID != "" || item.DNSBindingID != "" {
|
||||
return IssueResult{}, errors.New("独立 DNS 账户执行租约尚未就绪,拒绝使用系统凭据替代")
|
||||
}
|
||||
domains, err := requestedDomains(item)
|
||||
if err != nil {
|
||||
return IssueResult{}, err
|
||||
|
||||
Reference in new issue
Block a user