优化阿里云 DNS 权限验证等待时长
This commit is contained in:
1 parent
91eaf31d15
commit
d8205ae651
20 files changed
+560
-38
No files matched your search
@@ -69,6 +69,23 @@ func TestAdminDNSTestReturnsVerificationResult(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminAliyunDNSTestReportsFastVerificationTimeout(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir())
|
||||
cfg.SetupReady = true
|
||||
server := New(Dependencies{Config: cfg, SetupDNS: &fakeSetupDNSVerifier{}})
|
||||
response := httptest.NewRecorder()
|
||||
request := httptest.NewRequest(http.MethodPost, "/api/v1/dns/test", strings.NewReader(`{
|
||||
"provider":"aliyun",
|
||||
"test_domain":"example.com",
|
||||
"credentials":{"access_key_id":"test-id","access_key_secret":"test-secret","managed_zones":"example.com","allowed_domains":"example.com"}
|
||||
}`))
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
serveAdminHTTP(server, response, request)
|
||||
if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), `"verification_timeout_secs":15`) {
|
||||
t.Fatalf("管理端阿里云 DNS 在线测试未返回 15 秒等待上限:%d %s", response.Code, response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestAdminDNSTestRejectsUnavailableService(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir())
|
||||
cfg.SetupReady = true
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/dnsprovider"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
@@ -30,7 +31,9 @@ func (s *Server) longOperation(timeout time.Duration) gin.HandlerFunc {
|
||||
}
|
||||
|
||||
func (s *Server) dnsOperation(c *gin.Context) {
|
||||
s.longOperation(dnsAPIPermissionVerificationTimeout())(c)
|
||||
// 路由中间件在绑定 JSON 前无法可靠识别服务商,保留兼容服务商的最长响应时限。
|
||||
// testDNS 会在参数校验后按服务商建立更精确的工作上下文。
|
||||
s.longOperation(dnsprovider.PermissionVerificationTimeout)(c)
|
||||
}
|
||||
|
||||
func (s *Server) requireSameOrigin(c *gin.Context) {
|
||||
|
||||
@@ -157,7 +157,7 @@ func (s *Server) testAdminDNS(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (s *Server) testDNS(c *gin.Context) {
|
||||
verificationTimeoutSecs := int(dnsAPIPermissionVerificationTimeout().Seconds())
|
||||
verificationTimeoutSecs := int(dnsprovider.PermissionVerificationTimeout.Seconds())
|
||||
if s.setupDNS == nil {
|
||||
s.writeDNSTestError(c, http.StatusServiceUnavailable, "DNS 在线验证服务尚未初始化", nil, verificationTimeoutSecs)
|
||||
return
|
||||
@@ -167,7 +167,8 @@ func (s *Server) testDNS(c *gin.Context) {
|
||||
s.writeDNSTestError(c, http.StatusBadRequest, "DNS 测试请求参数无效", err, verificationTimeoutSecs)
|
||||
return
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), dnsAPIPermissionVerificationTimeout())
|
||||
verificationTimeoutSecs = int(dnsAPIPermissionVerificationTimeoutFor(request.ProviderID).Seconds())
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), dnsAPIPermissionVerificationTimeoutFor(request.ProviderID))
|
||||
defer cancel()
|
||||
result, err := s.setupDNS.Verify(ctx, setup.DNSVerificationInput{
|
||||
ProviderID: request.ProviderID, TestDomain: request.TestDomain, Credentials: request.Credentials,
|
||||
@@ -220,6 +221,10 @@ func dnsAPIPermissionVerificationTimeout() time.Duration {
|
||||
return dnsprovider.PermissionVerificationTimeout
|
||||
}
|
||||
|
||||
func dnsAPIPermissionVerificationTimeoutFor(providerID string) time.Duration {
|
||||
return dnsprovider.PermissionVerificationTimeoutFor(providerID)
|
||||
}
|
||||
|
||||
func (s *Server) applySetup(c *gin.Context) {
|
||||
if !s.setupMu.TryLock() {
|
||||
s.writeError(c, http.StatusConflict, "初始化正在执行,请等待当前操作完成", nil)
|
||||
|
||||
@@ -276,6 +276,39 @@ func TestSetupDNSTestUsesShortPermissionVerificationTimeout(t *testing.T) {
|
||||
t.Fatalf("DNS 在线测试请求超时不应继承 ACME 传播配置:剩余时间=%s", remaining)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetupAliyunDNSTestUsesFastAccountAPITimeout(t *testing.T) {
|
||||
baseDir := t.TempDir()
|
||||
cfg := config.Default(baseDir)
|
||||
cfg.ACME.PropagationTimeoutSecs = 86400
|
||||
cfg.ACME.PropagationPollingIntervalSecs = 60
|
||||
verifier := &fakeSetupDNSVerifier{verifyErr: errors.New("测试 DNS 验证失败")}
|
||||
server := New(Dependencies{Config: cfg, Repository: &stubDomainRepository{}, SetupDNS: verifier})
|
||||
|
||||
started := time.Now()
|
||||
request := httptest.NewRequest(http.MethodPost, "/api/v1/setup/dns/test", strings.NewReader(`{
|
||||
"provider":"aliyun",
|
||||
"test_domain":"example.com",
|
||||
"credentials":{"access_key_id":"test-id","access_key_secret":"test-secret","managed_zones":"example.com","allowed_domains":"example.com"}
|
||||
}`))
|
||||
request.RemoteAddr = "127.0.0.1:53000"
|
||||
request.Header.Set("Content-Type", "application/json")
|
||||
response := httptest.NewRecorder()
|
||||
server.Handler().ServeHTTP(response, request)
|
||||
if response.Code != http.StatusUnprocessableEntity {
|
||||
t.Fatalf("模拟阿里云 DNS 验证失败应返回 422,实际为 %d:%s", response.Code, response.Body.String())
|
||||
}
|
||||
if !strings.Contains(response.Body.String(), `"verification_timeout_secs":15`) {
|
||||
t.Fatalf("阿里云 DNS 验证失败响应应包含 15 秒等待上限:%s", response.Body.String())
|
||||
}
|
||||
if !verifier.verifyHasDeadline {
|
||||
t.Fatal("阿里云 DNS 在线测试应收到带截止时间的上下文")
|
||||
}
|
||||
remaining := verifier.verifyDeadline.Sub(started)
|
||||
if remaining < 14*time.Second || remaining > 16*time.Second {
|
||||
t.Fatalf("阿里云权限验证不应继承 ACME 传播配置:剩余时间=%s", remaining)
|
||||
}
|
||||
}
|
||||
func TestSetupApplyPersistsConfigurationWithoutPlainPassword(t *testing.T) {
|
||||
baseDir := t.TempDir()
|
||||
cfg := config.Default(baseDir)
|
||||
@@ -547,7 +580,7 @@ func TestSetupDNSTestReturnsNotImplementedForUnavailableProvider(t *testing.T) {
|
||||
if strings.Contains(response.Body.String(), "access_key_secret") || strings.Contains(response.Body.String(), "secret") {
|
||||
t.Fatal("未开放 Provider 响应不应包含提交的凭据")
|
||||
}
|
||||
if !strings.Contains(response.Body.String(), `"verification_timeout_secs":60`) {
|
||||
if !strings.Contains(response.Body.String(), `"verification_timeout_secs":15`) {
|
||||
t.Fatalf("未开放 Provider 响应应包含当前最大等待时间:%s", response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user