保存内置DNS续期与证书同步接续修复前基线
This commit is contained in:
1 parent
7fec05650f
commit
d6ea80a040
23 files changed
+704
-13
No files matched your search
@@ -0,0 +1,186 @@
|
||||
package ssl
|
||||
|
||||
import (
|
||||
"crypto/hmac"
|
||||
"crypto/rand"
|
||||
"crypto/sha1"
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/config"
|
||||
"github.com/go-acme/lego/v4/challenge"
|
||||
"github.com/go-acme/lego/v4/challenge/dns01"
|
||||
)
|
||||
|
||||
type aliDNSRecord struct {
|
||||
ID string
|
||||
Name string
|
||||
Value string
|
||||
}
|
||||
|
||||
// 每次签发独立记录创建结果,清理时只删除本实例创建且内容未被修改的记录。
|
||||
type aliDNSChallenge struct {
|
||||
mu sync.Mutex
|
||||
zone string
|
||||
accessKey string
|
||||
secretKey string
|
||||
endpoint string
|
||||
client *http.Client
|
||||
records map[string]aliDNSRecord
|
||||
}
|
||||
|
||||
func automaticDNSProvider(cfg *config.Config) (challenge.Provider, error) {
|
||||
if cfg == nil || cfg.EffectiveSSLType() != config.SSLTypeAutoDNS {
|
||||
return nil, newUserCertificateError("当前配置未启用项目 DNS 证书")
|
||||
}
|
||||
if cfg.SSL.DNSProvider == "" {
|
||||
return GetDnsChallengeInstance(), nil
|
||||
}
|
||||
accessKey, secretKey, err := config.DNSProviderCredentials(cfg.SSL)
|
||||
if err != nil {
|
||||
return nil, newUserCertificateError("DNS 服务商凭据不可用,请在 SSL 配置中重新设置")
|
||||
}
|
||||
zone := cfg.SSL.DNSZone
|
||||
if zone == "" {
|
||||
zone = strings.ToLower(strings.TrimSuffix(cfg.Domain, "."))
|
||||
}
|
||||
if cfg.Domain != zone && !strings.HasSuffix(cfg.Domain, "."+zone) {
|
||||
return nil, newUserCertificateError("DNS 托管区域必须包含邮件主域名")
|
||||
}
|
||||
return &aliDNSChallenge{
|
||||
zone: zone, accessKey: accessKey, secretKey: secretKey,
|
||||
endpoint: "https://alidns.aliyuncs.com/",
|
||||
client: &http.Client{Timeout: 15 * time.Second, CheckRedirect: func(*http.Request, []*http.Request) error {
|
||||
return http.ErrUseLastResponse
|
||||
}},
|
||||
records: make(map[string]aliDNSRecord),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (provider *aliDNSChallenge) Timeout() (time.Duration, time.Duration) {
|
||||
return 5 * time.Minute, 5 * time.Second
|
||||
}
|
||||
|
||||
func (provider *aliDNSChallenge) record(domain, keyAuth string) (aliDNSRecord, error) {
|
||||
domain = strings.TrimPrefix(strings.TrimSuffix(strings.ToLower(domain), "."), "*.")
|
||||
info := dns01.GetChallengeInfo(domain, keyAuth)
|
||||
fqdn := strings.TrimSuffix(info.EffectiveFQDN, ".")
|
||||
if !strings.HasSuffix(fqdn, "."+provider.zone) {
|
||||
return aliDNSRecord{}, errors.New("DNS 挑战不属于配置的托管区域")
|
||||
}
|
||||
name := strings.TrimSuffix(fqdn, "."+provider.zone)
|
||||
if name != "_acme-challenge" && !strings.HasPrefix(name, "_acme-challenge.") {
|
||||
return aliDNSRecord{}, errors.New("DNS 挑战目标不是允许的 ACME 记录")
|
||||
}
|
||||
return aliDNSRecord{Name: name, Value: info.Value}, nil
|
||||
}
|
||||
|
||||
func (provider *aliDNSChallenge) Present(domain, token, keyAuth string) error {
|
||||
provider.mu.Lock()
|
||||
defer provider.mu.Unlock()
|
||||
key := domain + ":" + keyAuth
|
||||
if _, exists := provider.records[key]; exists {
|
||||
return nil
|
||||
}
|
||||
record, err := provider.record(domain, keyAuth)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var response struct{ RecordID string `json:"RecordId"` }
|
||||
err = provider.call("AddDomainRecord", url.Values{
|
||||
"DomainName": {provider.zone}, "RR": {record.Name}, "Type": {"TXT"},
|
||||
"Value": {record.Value}, "TTL": {"600"},
|
||||
}, &response)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if response.RecordID == "" {
|
||||
return errors.New("DNS 服务商未返回新建记录编号")
|
||||
}
|
||||
record.ID = response.RecordID
|
||||
provider.records[key] = record
|
||||
return nil
|
||||
}
|
||||
|
||||
func (provider *aliDNSChallenge) CleanUp(domain, token, keyAuth string) error {
|
||||
provider.mu.Lock()
|
||||
defer provider.mu.Unlock()
|
||||
// 清理使用创建时保存的目标,避免 CNAME 变化后误删或遗漏原记录。
|
||||
key := domain + ":" + keyAuth
|
||||
created, exists := provider.records[key]
|
||||
if !exists {
|
||||
return nil
|
||||
}
|
||||
var current struct {
|
||||
RecordID string `json:"RecordId"`
|
||||
Domain string `json:"DomainName"`
|
||||
Name string `json:"RR"`
|
||||
Type string `json:"Type"`
|
||||
Value string `json:"Value"`
|
||||
}
|
||||
if err := provider.call("DescribeDomainRecordInfo", url.Values{"RecordId": {created.ID}}, ¤t); err != nil {
|
||||
return err
|
||||
}
|
||||
if current.RecordID != created.ID || current.Domain != provider.zone || current.Name != created.Name || current.Type != "TXT" || current.Value != created.Value {
|
||||
return errors.New("DNS 挑战记录已被修改,保留记录并停止自动清理")
|
||||
}
|
||||
if err := provider.call("DeleteDomainRecord", url.Values{"RecordId": {created.ID}}, nil); err != nil {
|
||||
return err
|
||||
}
|
||||
delete(provider.records, key)
|
||||
return nil
|
||||
}
|
||||
|
||||
func aliDNSPercentEncode(value string) string {
|
||||
return strings.ReplaceAll(url.QueryEscape(value), "+", "%20")
|
||||
}
|
||||
|
||||
func (provider *aliDNSChallenge) call(action string, values url.Values, target any) error {
|
||||
nonce := make([]byte, 16)
|
||||
if _, err := rand.Read(nonce); err != nil {
|
||||
return errors.New("DNS 请求随机数生成失败")
|
||||
}
|
||||
values.Set("Action", action)
|
||||
values.Set("Version", "2015-01-09")
|
||||
values.Set("Format", "JSON")
|
||||
values.Set("AccessKeyId", provider.accessKey)
|
||||
values.Set("SignatureMethod", "HMAC-SHA1")
|
||||
values.Set("SignatureVersion", "1.0")
|
||||
values.Set("SignatureNonce", hex.EncodeToString(nonce))
|
||||
values.Set("Timestamp", time.Now().UTC().Format("2006-01-02T15:04:05Z"))
|
||||
canonical := strings.ReplaceAll(values.Encode(), "+", "%20")
|
||||
mac := hmac.New(sha1.New, []byte(provider.secretKey+"&"))
|
||||
_, _ = mac.Write([]byte("POST&%2F&" + aliDNSPercentEncode(canonical)))
|
||||
values.Set("Signature", base64.StdEncoding.EncodeToString(mac.Sum(nil)))
|
||||
request, err := http.NewRequest(http.MethodPost, provider.endpoint, strings.NewReader(values.Encode()))
|
||||
if err != nil {
|
||||
return errors.New("DNS 请求创建失败")
|
||||
}
|
||||
request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
response, err := provider.client.Do(request)
|
||||
if err != nil {
|
||||
return errors.New("DNS 服务商连接失败或超时")
|
||||
}
|
||||
defer response.Body.Close()
|
||||
data, err := io.ReadAll(io.LimitReader(response.Body, (1<<20)+1))
|
||||
if err != nil || len(data) > 1<<20 {
|
||||
return errors.New("DNS 服务商响应无效")
|
||||
}
|
||||
var status struct{ Code string `json:"Code"` }
|
||||
if json.Unmarshal(data, &status) != nil || response.StatusCode != http.StatusOK || status.Code != "" {
|
||||
// 服务商错误可能包含凭据、签名或请求原文,不能直接交给日志。
|
||||
return errors.New("DNS 服务商拒绝请求,请检查凭据、区域和记录管理权限")
|
||||
}
|
||||
if target != nil && json.Unmarshal(data, target) != nil {
|
||||
return errors.New("DNS 服务商响应解析失败")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package ssl
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/config"
|
||||
)
|
||||
|
||||
func TestAutomaticDNSCleansOnlyOwnedUnchangedRecords(t *testing.T) {
|
||||
t.Setenv("LEGO_DISABLE_CNAME_SUPPORT", "true")
|
||||
var mu sync.Mutex
|
||||
records := map[string]aliDNSRecord{"existing": {ID: "existing", Name: "_acme-challenge", Value: "unrelated-record"}}
|
||||
adds, deletes := 0, 0
|
||||
failDelete, tamper := false, false
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
if r.Method != http.MethodPost || r.ParseForm() != nil || r.Form.Get("AccessKeyId") != "test-access" || r.Form.Get("Signature") == "" {
|
||||
t.Error("invalid DNS API request")
|
||||
w.WriteHeader(400)
|
||||
return
|
||||
}
|
||||
id := r.Form.Get("RecordId")
|
||||
switch r.Form.Get("Action") {
|
||||
case "AddDomainRecord":
|
||||
adds++
|
||||
id = fmt.Sprint(adds)
|
||||
records[id] = aliDNSRecord{ID: id, Name: r.Form.Get("RR"), Value: r.Form.Get("Value")}
|
||||
_ = json.NewEncoder(w).Encode(map[string]string{"RecordId": id})
|
||||
case "DescribeDomainRecordInfo":
|
||||
record := records[id]
|
||||
if tamper { record.Value = "changed-by-user" }
|
||||
_ = json.NewEncoder(w).Encode(map[string]string{"RecordId": id, "DomainName": "example.com", "RR": record.Name, "Type": "TXT", "Value": record.Value})
|
||||
case "DeleteDomainRecord":
|
||||
if failDelete { w.WriteHeader(503); _, _ = w.Write([]byte(`{"Code":"Busy"}`)); return }
|
||||
deletes++
|
||||
delete(records, id)
|
||||
_ = json.NewEncoder(w).Encode(map[string]string{"RecordId": id})
|
||||
default:
|
||||
t.Error("unexpected DNS action")
|
||||
w.WriteHeader(400)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
provider := &aliDNSChallenge{zone: "example.com", accessKey: "test-access", secretKey: "test-secret", endpoint: server.URL, client: server.Client(), records: map[string]aliDNSRecord{}}
|
||||
var workers sync.WaitGroup
|
||||
for _, domain := range []string{"example.com", "*.example.com"} {
|
||||
for i := 0; i < 3; i++ {
|
||||
workers.Add(1)
|
||||
go func(domain string) {
|
||||
defer workers.Done()
|
||||
if err := provider.Present(domain, "token", "key-"+domain); err != nil { t.Error(err) }
|
||||
}(domain)
|
||||
}
|
||||
}
|
||||
workers.Wait()
|
||||
if adds != 2 || len(records) != 3 { t.Fatalf("same-name TXT records lost or duplicated: adds=%d records=%d", adds, len(records)) }
|
||||
if err := provider.CleanUp("other.example.com", "token", "unknown"); err != nil || deletes != 0 { t.Fatal("unknown challenge must not touch DNS") }
|
||||
mu.Lock(); tamper = true; mu.Unlock()
|
||||
if err := provider.CleanUp("example.com", "token", "key-example.com"); err == nil || deletes != 0 { t.Fatal("modified record must be retained") }
|
||||
mu.Lock(); tamper = false; failDelete = true; mu.Unlock()
|
||||
if err := provider.CleanUp("example.com", "token", "key-example.com"); err == nil || len(provider.records) != 2 { t.Fatal("failed deletion must retain ownership for retry") }
|
||||
mu.Lock(); failDelete = false; mu.Unlock()
|
||||
if err := provider.CleanUp("example.com", "token", "key-example.com"); err != nil { t.Fatal(err) }
|
||||
if len(records) != 2 { t.Fatal("cleaning root challenge removed wildcard or unrelated TXT") }
|
||||
if err := provider.CleanUp("*.example.com", "token", "key-*.example.com"); err != nil { t.Fatal(err) }
|
||||
if len(records) != 1 || records["existing"].Value != "unrelated-record" { t.Fatal("existing TXT must survive all challenge cleanup") }
|
||||
if err := provider.CleanUp("*.example.com", "token", "key-*.example.com"); err != nil || deletes != 2 { t.Fatal("cleanup must be idempotent") }
|
||||
}
|
||||
|
||||
func TestAutomaticDNSRejectsOutsideZoneAndRedactsErrors(t *testing.T) {
|
||||
t.Setenv("LEGO_DISABLE_CNAME_SUPPORT", "true")
|
||||
calls := 0
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
calls++
|
||||
w.WriteHeader(403)
|
||||
_, _ = w.Write([]byte(`{"Code":"Denied","Message":"test-access test-secret signature"}`))
|
||||
}))
|
||||
defer server.Close()
|
||||
provider := &aliDNSChallenge{zone: "example.com", accessKey: "test-access", secretKey: "test-secret", endpoint: server.URL, client: server.Client(), records: map[string]aliDNSRecord{}}
|
||||
if err := provider.Present("unrelated.com", "token", "key"); err == nil || calls != 0 { t.Fatal("out-of-zone write attempted") }
|
||||
err := provider.Present("example.com", "token", "key")
|
||||
if err == nil || calls != 1 { t.Fatal("provider refusal not reported") }
|
||||
for _, secret := range []string{"test-access", "test-secret", "signature"} {
|
||||
if strings.Contains(err.Error(), secret) { t.Fatal("error leaked provider response") }
|
||||
}
|
||||
for _, management := range []string{config.SSLManagementCustom, config.SSLManagementWebServer} {
|
||||
if _, err := automaticDNSProvider(&config.Config{SSL: config.SSLConfig{Management: management, Challenge: config.SSLChallengeDNS}}); err == nil { t.Fatal("external certificate mode allowed automatic DNS") }
|
||||
}
|
||||
}
|
||||
@@ -112,11 +112,16 @@ func SetSSL(sslType, priKey, crtKey string) error {
|
||||
}
|
||||
|
||||
if cfg.SSLType != config.SSLTypeUser {
|
||||
previousSSL := cfg.SSL
|
||||
clearLegacySSLPaths(cfg)
|
||||
cfg.SSL = config.SSLConfig{
|
||||
Management: config.SSLManagementProject,
|
||||
Mode: config.ManagedSSLModeDefault,
|
||||
DefaultDirectory: runtimepath.SSLReference(config.ROOT_PATH, "data/ssl"),
|
||||
DNSProvider: previousSSL.DNSProvider,
|
||||
DNSZone: previousSSL.DNSZone,
|
||||
DNSAccessKey: previousSSL.DNSAccessKey,
|
||||
DNSSecretKey: previousSSL.DNSSecretKey,
|
||||
}
|
||||
if cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
cfg.SSL.Challenge = config.SSLChallengeDNS
|
||||
@@ -174,6 +179,7 @@ func applyManagedSSLReference(cfg *config.Config, reference config.ManagedSSLRef
|
||||
}
|
||||
clearLegacySSLPaths(cfg)
|
||||
sslType := cfg.EffectiveSSLType()
|
||||
previousSSL := cfg.SSL
|
||||
management := cfg.SSL.Management
|
||||
if reference.Mode == config.ManagedSSLModeDefault {
|
||||
management = config.SSLManagementProject
|
||||
@@ -186,6 +192,10 @@ func applyManagedSSLReference(cfg *config.Config, reference config.ManagedSSLRef
|
||||
DefaultDirectory: "ssl",
|
||||
CertificateRef: reference.CertificateRef,
|
||||
PrivateKeyRef: reference.PrivateKeyRef,
|
||||
DNSProvider: previousSSL.DNSProvider,
|
||||
DNSZone: previousSSL.DNSZone,
|
||||
DNSAccessKey: previousSSL.DNSAccessKey,
|
||||
DNSSecretKey: previousSSL.DNSSecretKey,
|
||||
}
|
||||
if reference.Mode == config.ManagedSSLModeUpload {
|
||||
cfg.SSL.CustomDirectory = "ssl"
|
||||
@@ -403,16 +413,15 @@ func renewCertificate(privateKey *ecdsa.PrivateKey, cfg *config.Config) error {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
} else if cfg.EffectiveSSLType() == config.SSLTypeAutoDNS {
|
||||
err = client.Challenge.SetDNS01Provider(GetDnsChallengeInstance(), dns01.AddDNSTimeout(60*time.Minute))
|
||||
provider, providerErr := automaticDNSProvider(cfg)
|
||||
if providerErr != nil {
|
||||
return providerErr
|
||||
}
|
||||
err = client.Challenge.SetDNS01Provider(provider, dns01.AddDNSTimeout(15*time.Second))
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
|
||||
log.Errorf("Please Set DNS Record/请将以下内容添加到DNS记录中:\n")
|
||||
for _, item := range GetDnsChallengeInstance().GetDNSSettings(nil) {
|
||||
log.Errorf("Type:%s\tHost:%s\tValue generated\n", item.Type, item.Host)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var reg *registration.Resource
|
||||
@@ -466,7 +475,11 @@ func generateCertificate(privateKey *ecdsa.PrivateKey, cfg *config.Config, newAc
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
} else if cfg.EffectiveSSLType() == config.SSLTypeAutoDNS {
|
||||
err = client.Challenge.SetDNS01Provider(GetDnsChallengeInstance(), dns01.AddDNSTimeout(60*time.Minute))
|
||||
provider, providerErr := automaticDNSProvider(cfg)
|
||||
if providerErr != nil {
|
||||
return providerErr
|
||||
}
|
||||
err = client.Challenge.SetDNS01Provider(provider, dns01.AddDNSTimeout(15*time.Second))
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user