进一步压缩阿里云 DNS 权限验证等待时间
This commit is contained in:
1 parent
d8205ae651
commit
938e47d821
10 files changed
+18
-18
No files matched your search
@@ -85,7 +85,7 @@ func TestDNSCheckReportsLiveResultWithoutPersistingConfiguration(t *testing.T) {
|
||||
t.Fatal("权限请求必须设置超时")
|
||||
}
|
||||
remaining := time.Until(deadline)
|
||||
if remaining < 14*time.Second || remaining > 16*time.Second {
|
||||
if remaining < 9*time.Second || remaining > 11*time.Second {
|
||||
t.Fatalf("阿里云 CLI 权限验证时限错误:%s", remaining)
|
||||
}
|
||||
report := dnsprovider.AuthorizationReport{Provider: "aliyun", RequestedDomain: name, Verified: outcome == "allowed"}
|
||||
|
||||
@@ -20,7 +20,7 @@ const (
|
||||
aliyunDefaultRegion = "cn-hangzhou"
|
||||
aliyunAuthorizationTTL = 600
|
||||
aliyunAuthorizationTimeout = 30 * time.Second
|
||||
aliyunAPICallTimeout = 5 * time.Second
|
||||
aliyunAPICallTimeout = 3 * time.Second
|
||||
)
|
||||
|
||||
// AuthorizationDomain 描述一个阿里云 DNS 根域名的授权探测结果。
|
||||
|
||||
@@ -207,7 +207,7 @@ func TestAliyunAuthorizationVerifyCleansUpAfterRequestCancellation(t *testing.T)
|
||||
}
|
||||
|
||||
func TestPermissionVerificationTimeoutForAliyunIsIndependentFromPropagation(t *testing.T) {
|
||||
if got := PermissionVerificationTimeoutFor(Aliyun); got != 15*time.Second {
|
||||
if got := PermissionVerificationTimeoutFor(Aliyun); got != 10*time.Second {
|
||||
t.Fatalf("阿里云权限验证时限错误:%s", got)
|
||||
}
|
||||
if got := PermissionVerificationTimeoutFor(Cloudflare); got != 60*time.Second {
|
||||
|
||||
@@ -40,7 +40,7 @@ const (
|
||||
|
||||
// AliyunPermissionVerificationTimeout 限制阿里云账号内的创建、查询和清理闭环。
|
||||
// 该流程不等待公网 DNS 传播。
|
||||
AliyunPermissionVerificationTimeout = 15 * time.Second
|
||||
AliyunPermissionVerificationTimeout = 10 * time.Second
|
||||
|
||||
dnsCleanupTimeout = 30 * time.Second
|
||||
defaultDNSPermissionTXTLookupTimeout = 30 * time.Second
|
||||
|
||||
@@ -81,8 +81,8 @@ func TestAdminAliyunDNSTestReportsFastVerificationTimeout(t *testing.T) {
|
||||
}`))
|
||||
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())
|
||||
if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), `"verification_timeout_secs":10`) {
|
||||
t.Fatalf("管理端阿里云 DNS 在线测试未返回 10 秒等待上限:%d %s", response.Code, response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -298,14 +298,14 @@ func TestSetupAliyunDNSTestUsesFastAccountAPITimeout(t *testing.T) {
|
||||
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 !strings.Contains(response.Body.String(), `"verification_timeout_secs":10`) {
|
||||
t.Fatalf("阿里云 DNS 验证失败响应应包含 10 秒等待上限:%s", response.Body.String())
|
||||
}
|
||||
if !verifier.verifyHasDeadline {
|
||||
t.Fatal("阿里云 DNS 在线测试应收到带截止时间的上下文")
|
||||
}
|
||||
remaining := verifier.verifyDeadline.Sub(started)
|
||||
if remaining < 14*time.Second || remaining > 16*time.Second {
|
||||
if remaining < 9*time.Second || remaining > 11*time.Second {
|
||||
t.Fatalf("阿里云权限验证不应继承 ACME 传播配置:剩余时间=%s", remaining)
|
||||
}
|
||||
}
|
||||
@@ -580,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":15`) {
|
||||
if !strings.Contains(response.Body.String(), `"verification_timeout_secs":10`) {
|
||||
t.Fatalf("未开放 Provider 响应应包含当前最大等待时间:%s", response.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user