修复阿里云授权探测随机记录名格式并补充回归

This commit is contained in:
xuans committed 2026-09-30 21:49:00 +08:00
1 parent 0864300506
commit 91e1123fa6
5 files changed
+93 -3

No files matched your search

@@ -4,6 +4,7 @@ import (
"context"
"crypto/rand"
"encoding/base64"
"encoding/hex"
"errors"
"fmt"
"strings"
@@ -97,7 +98,7 @@ func (c *AliyunAuthorizationChecker) verifyResolved(ctx context.Context, request
if err != nil {
return result, err
}
suffix, err := randomAuthorizationValue(18)
suffix, err := randomAuthorizationLabel()
if err != nil {
return result, err
}
@@ -289,6 +290,15 @@ func randomAuthorizationValue(size int) (string, error) {
return base64.RawURLEncoding.EncodeToString(data), nil
}
func randomAuthorizationLabel() (string, error) {
// 主机记录标签不能以连字符结尾;完整编码随机字节,避免替换字符造成分布偏差。
data := make([]byte, 18)
if _, err := rand.Read(data); err != nil {
return "", err
}
return hex.EncodeToString(data), nil
}
func dereferenceString(value *string) string {
if value == nil {
return ""
@@ -307,6 +317,9 @@ func DiagnoseAliyunError(err error, domainName string) string {
}
msg := err.Error()
lowered := strings.ToLower(msg)
if strings.Contains(lowered, "invalidrr.format") {
return "阿里云拒绝了授权探测记录名格式,本次验证未通过;这不代表 RAM 权限不足,请检查系统生成的记录名,不要扩大账号权限"
}
if strings.Contains(msg, "权威 DNS 托管区") || strings.Contains(lowered, "soa lookup") {
return "未能从公开 DNS 的 SOA 记录识别该域名唯一的权威托管区,系统未构造阿里云客户端,也未创建临时 TXT 记录。请检查域名是否已正确委派并可被公网 DNS 查询后重试"
}
@@ -0,0 +1,58 @@
package dnsprovider
import (
"encoding/base64"
"encoding/hex"
"errors"
"strings"
"testing"
)
func TestAliyunAuthorizationRecordLabelUsesSafeRandomSuffix(t *testing.T) {
for _, name := range []string{"example.com", "web.example.com", "*.web.example.com", "www.sub.example.com"} {
t.Run(name, func(t *testing.T) {
seen := make(map[string]bool)
for attempt := 0; attempt < 32; attempt++ {
api := &authorizationRecordAPI{}
report, err := newAuthorizationCheckerForTest(api).Verify(t.Context(), name, scopeCredentials())
if err != nil || !report.Verified {
t.Fatalf("授权闭环验证失败:report=%+v err=%v", report, err)
}
label := strings.SplitN(api.rr, ".", 2)[0]
const prefix = "_scert-authorization-"
suffix := strings.TrimPrefix(label, prefix)
if !strings.HasPrefix(label, prefix) || len(label) > 63 || len(suffix) != 36 {
t.Fatalf("随机主机记录标签必须使用固定长度安全后缀:%q", label)
}
decoded, err := hex.DecodeString(suffix)
if err != nil || len(decoded) != 18 || suffix != strings.ToLower(suffix) {
t.Fatalf("随机后缀必须完整编码十八字节随机数且只使用小写十六进制:%q", suffix)
}
if seen[suffix] {
t.Fatalf("不同请求复用了随机探测后缀:%q", suffix)
}
seen[suffix] = true
targetSuffix := strings.TrimSuffix(strings.TrimPrefix(name, "*."), ".example.com")
if name == "example.com" {
targetSuffix = ""
} else {
targetSuffix = "." + targetSuffix
}
if api.rr != label+targetSuffix || report.RecordName != api.rr+".example.com." {
t.Fatalf("探测记录越出指定域名范围:rr=%q record=%q", api.rr, report.RecordName)
}
value, err := base64.RawURLEncoding.DecodeString(api.value)
if err != nil || len(value) != 32 || callNames(api.calls) != "add,describe,delete" {
t.Fatalf("记录名修复不应改变 TXT 随机强度或写读清理闭环:value=%q calls=%v", api.value, api.calls)
}
}
})
}
}
func TestAliyunInvalidRecordFormatDiagnosisDoesNotSuggestPermissionChange(t *testing.T) {
message := DiagnoseAliyunError(errors.New("SDKError: Code: InvalidRR.Format secret-provider-detail"), "web.example.com")
if !strings.Contains(message, "记录名格式") || !strings.Contains(message, "权限不足") || strings.Contains(message, "secret-provider-detail") {
t.Fatalf("随机记录名格式错误应提供脱敏且不误导扩权的说明:%s", message)
}
}