完善证书管理与邮件通知流程
This commit is contained in:
1 parent
c74372284a
commit
b2833b761d
60 files changed
+7340
-254
No files matched your search
@@ -47,7 +47,8 @@ var descriptors = map[string]Descriptor{
|
||||
},
|
||||
},
|
||||
Aliyun: {
|
||||
ID: Aliyun, Name: "阿里云 DNS", Description: "适配器字段已定义,在线验证将在后续任务接入。",
|
||||
ID: Aliyun, Name: "阿里云 DNS", Available: true,
|
||||
Description: "使用 RAM AccessKey 创建和清理 DNS-01 测试记录。",
|
||||
CredentialFields: []CredentialField{
|
||||
{Name: "access_key_id", Label: "AccessKey ID", Required: true},
|
||||
{Name: "access_key_secret", Label: "AccessKey Secret", Secret: true, Required: true},
|
||||
@@ -55,7 +56,8 @@ var descriptors = map[string]Descriptor{
|
||||
},
|
||||
},
|
||||
DNSPod: {
|
||||
ID: DNSPod, Name: "DNSPod", Description: "使用腾讯云 DNSPod API 凭据;在线验证将在后续任务接入。",
|
||||
ID: DNSPod, Name: "DNSPod", Available: true,
|
||||
Description: "使用 DNSPod API 凭据创建和清理 DNS-01 测试记录。",
|
||||
CredentialFields: []CredentialField{
|
||||
{Name: "secret_id", Label: "SecretId", Required: true},
|
||||
{Name: "secret_key", Label: "SecretKey", Secret: true, Required: true},
|
||||
@@ -70,7 +72,8 @@ var descriptors = map[string]Descriptor{
|
||||
},
|
||||
},
|
||||
HuaweiCloud: {
|
||||
ID: HuaweiCloud, Name: "华为云", Description: "适配器字段已定义,在线验证将在后续任务接入。",
|
||||
ID: HuaweiCloud, Name: "华为云", Available: true,
|
||||
Description: "使用 Access Key、Secret Access Key 和区域创建 DNS-01 测试记录。",
|
||||
CredentialFields: []CredentialField{
|
||||
{Name: "access_key_id", Label: "Access Key ID", Required: true},
|
||||
{Name: "secret_access_key", Label: "Secret Access Key", Secret: true, Required: true},
|
||||
@@ -78,7 +81,8 @@ var descriptors = map[string]Descriptor{
|
||||
},
|
||||
},
|
||||
TencentCloud: {
|
||||
ID: TencentCloud, Name: "腾讯云", Description: "使用腾讯云 DNSPod API;在线验证将在后续任务接入。",
|
||||
ID: TencentCloud, Name: "腾讯云", Available: true,
|
||||
Description: "使用腾讯云 DNSPod API 凭据创建和清理 DNS-01 测试记录。",
|
||||
CredentialFields: []CredentialField{
|
||||
{Name: "secret_id", Label: "SecretId", Required: true},
|
||||
{Name: "secret_key", Label: "SecretKey", Secret: true, Required: true},
|
||||
@@ -87,7 +91,8 @@ var descriptors = map[string]Descriptor{
|
||||
},
|
||||
},
|
||||
Route53: {
|
||||
ID: Route53, Name: "AWS Route 53", Description: "适配器字段已定义,在线验证将在后续任务接入。",
|
||||
ID: Route53, Name: "AWS Route 53", Available: true,
|
||||
Description: "使用 AWS 凭据和区域创建和清理 DNS-01 测试记录。",
|
||||
CredentialFields: []CredentialField{
|
||||
{Name: "access_key_id", Label: "Access Key ID", Required: true},
|
||||
{Name: "secret_access_key", Label: "Secret Access Key", Secret: true, Required: true},
|
||||
@@ -97,7 +102,8 @@ var descriptors = map[string]Descriptor{
|
||||
},
|
||||
},
|
||||
GoogleCloud: {
|
||||
ID: GoogleCloud, Name: "Google Cloud DNS", Description: "适配器字段已定义,在线验证将在后续任务接入。",
|
||||
ID: GoogleCloud, Name: "Google Cloud DNS", Available: true,
|
||||
Description: "使用 Google Cloud 服务账号创建和清理 DNS-01 测试记录。",
|
||||
CredentialFields: []CredentialField{
|
||||
{Name: "service_account_json", Label: "服务账号 JSON", Secret: true, Required: true},
|
||||
{Name: "project", Label: "项目 ID", Required: true},
|
||||
|
||||
@@ -1,11 +1,20 @@
|
||||
package dnsprovider
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/go-acme/lego/v5/challenge"
|
||||
"github.com/go-acme/lego/v5/providers/dns/alidns"
|
||||
"github.com/go-acme/lego/v5/providers/dns/cloudflare"
|
||||
"github.com/go-acme/lego/v5/providers/dns/gcloud"
|
||||
"github.com/go-acme/lego/v5/providers/dns/huaweicloud"
|
||||
"github.com/go-acme/lego/v5/providers/dns/route53"
|
||||
"github.com/go-acme/lego/v5/providers/dns/tencentcloud"
|
||||
"golang.org/x/oauth2/google"
|
||||
gdns "google.golang.org/api/dns/v1"
|
||||
)
|
||||
|
||||
type LegoFactory struct{}
|
||||
@@ -23,11 +32,15 @@ func (LegoFactory) Create(providerID string, credentials map[string]string) (cha
|
||||
if !descriptor.Available {
|
||||
return nil, fmt.Errorf("%w:%s", ErrProviderUnavailable, descriptor.Name)
|
||||
}
|
||||
cleaned, err := ValidateCredentials(providerID, credentials)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
switch providerID {
|
||||
case Cloudflare:
|
||||
cfg := cloudflare.NewDefaultConfig()
|
||||
cfg.AuthToken = credentials["api_token"]
|
||||
cfg.ZoneToken = credentials["zone_token"]
|
||||
cfg.AuthToken = cleaned["api_token"]
|
||||
cfg.ZoneToken = cleaned["zone_token"]
|
||||
if cfg.ZoneToken == "" {
|
||||
cfg.ZoneToken = cfg.AuthToken
|
||||
}
|
||||
@@ -36,6 +49,85 @@ func (LegoFactory) Create(providerID string, credentials map[string]string) (cha
|
||||
return nil, fmt.Errorf("创建 Cloudflare DNS Provider 失败:%w", err)
|
||||
}
|
||||
return provider, nil
|
||||
case Aliyun:
|
||||
cfg := alidns.NewDefaultConfig()
|
||||
cfg.APIKey = cleaned["access_key_id"]
|
||||
cfg.SecretKey = cleaned["access_key_secret"]
|
||||
cfg.SecurityToken = cleaned["security_token"]
|
||||
provider, err := alidns.NewDNSProviderConfig(cfg)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建阿里云 DNS Provider 失败:%w", err)
|
||||
}
|
||||
return provider, nil
|
||||
case DNSPod, TencentCloud:
|
||||
cfg := tencentcloud.NewDefaultConfig()
|
||||
cfg.SecretID = cleaned["secret_id"]
|
||||
cfg.SecretKey = cleaned["secret_key"]
|
||||
cfg.SessionToken = cleaned["session_token"]
|
||||
provider, err := tencentcloud.NewDNSProviderConfig(cfg)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建腾讯云 DNSPod Provider 失败:%w", err)
|
||||
}
|
||||
return provider, nil
|
||||
case HuaweiCloud:
|
||||
cfg := huaweicloud.NewDefaultConfig()
|
||||
cfg.AccessKeyID = cleaned["access_key_id"]
|
||||
cfg.SecretAccessKey = cleaned["secret_access_key"]
|
||||
cfg.Region = cleaned["region"]
|
||||
provider, err := huaweicloud.NewDNSProviderConfig(cfg)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建华为云 DNS Provider 失败:%w", err)
|
||||
}
|
||||
return provider, nil
|
||||
case Route53:
|
||||
cfg := route53.NewDefaultConfig()
|
||||
cfg.AccessKeyID = cleaned["access_key_id"]
|
||||
cfg.SecretAccessKey = cleaned["secret_access_key"]
|
||||
cfg.SessionToken = cleaned["session_token"]
|
||||
cfg.Region = cleaned["region"]
|
||||
cfg.HostedZoneID = cleaned["hosted_zone_id"]
|
||||
provider, err := route53.NewDNSProviderConfig(cfg)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建 AWS Route 53 DNS Provider 失败:%w", err)
|
||||
}
|
||||
return provider, nil
|
||||
case GoogleCloud:
|
||||
serviceAccountJSON := strings.TrimSpace(cleaned["service_account_json"])
|
||||
var serviceAccount struct {
|
||||
ProjectID string `json:"project_id"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(serviceAccountJSON), &serviceAccount); err != nil {
|
||||
return nil, fmt.Errorf("创建 Google Cloud DNS Provider 失败:服务账号 JSON 格式无效:%w", err)
|
||||
}
|
||||
if serviceAccount.ProjectID == "" {
|
||||
serviceAccount.ProjectID = cleaned["project"]
|
||||
if serviceAccount.ProjectID == "" {
|
||||
return nil, fmt.Errorf("创建 Google Cloud DNS Provider 失败:项目 ID 不能为空")
|
||||
}
|
||||
var raw map[string]any
|
||||
if err := json.Unmarshal([]byte(serviceAccountJSON), &raw); err != nil {
|
||||
return nil, fmt.Errorf("创建 Google Cloud DNS Provider 失败:服务账号 JSON 格式无效:%w", err)
|
||||
}
|
||||
raw["project_id"] = serviceAccount.ProjectID
|
||||
data, err := json.Marshal(raw)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建 Google Cloud DNS Provider 失败:编码服务账号 JSON 失败:%w", err)
|
||||
}
|
||||
serviceAccountJSON = string(data)
|
||||
}
|
||||
jwtConfig, err := google.JWTConfigFromJSON([]byte(serviceAccountJSON), gdns.NdevClouddnsReadwriteScope)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建 Google Cloud DNS Provider 失败:服务账号凭据无效:%w", err)
|
||||
}
|
||||
cfg := gcloud.NewDefaultConfig()
|
||||
cfg.Project = serviceAccount.ProjectID
|
||||
cfg.ZoneID = cleaned["zone_id"]
|
||||
cfg.HTTPClient = jwtConfig.Client(context.Background())
|
||||
provider, err := gcloud.NewDNSProviderConfig(cfg)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("创建 Google Cloud DNS Provider 失败:%w", err)
|
||||
}
|
||||
return provider, nil
|
||||
default:
|
||||
return nil, fmt.Errorf("%w:%s", ErrProviderUnavailable, descriptor.Name)
|
||||
}
|
||||
|
||||
@@ -66,8 +66,94 @@ func TestValidateCredentialsRejectsUnknownField(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestUnavailableProviderReturnsTypedError(t *testing.T) {
|
||||
_, err := NewLegoFactory().Create(Aliyun, map[string]string{"access_key_id": "id", "access_key_secret": "secret"})
|
||||
_, err := NewLegoFactory().Create(CNAME, map[string]string{"delegated_domain": "acme.example.com", "delegated_provider": "cloudflare"})
|
||||
if !errors.Is(err, ErrProviderUnavailable) {
|
||||
t.Fatalf("未开放适配器应返回指定错误:%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLegoFactoryCreatesConfiguredProviders(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
providerID string
|
||||
credentials map[string]string
|
||||
}{
|
||||
{
|
||||
name: "阿里云 DNS",
|
||||
providerID: Aliyun,
|
||||
credentials: map[string]string{
|
||||
"access_key_id": "id",
|
||||
"access_key_secret": "secret",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "DNSPod",
|
||||
providerID: DNSPod,
|
||||
credentials: map[string]string{
|
||||
"secret_id": "id",
|
||||
"secret_key": "secret",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "华为云无效区域校验",
|
||||
providerID: HuaweiCloud,
|
||||
credentials: map[string]string{
|
||||
"access_key_id": "id",
|
||||
"secret_access_key": "secret",
|
||||
"region": "invalid-region",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "腾讯云",
|
||||
providerID: TencentCloud,
|
||||
credentials: map[string]string{
|
||||
"secret_id": "id",
|
||||
"secret_key": "secret",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "AWS Route 53",
|
||||
providerID: Route53,
|
||||
credentials: map[string]string{
|
||||
"access_key_id": "id",
|
||||
"secret_access_key": "secret",
|
||||
"region": "us-east-1",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
factory := NewLegoFactory()
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
provider, err := factory.Create(test.providerID, test.credentials)
|
||||
if test.providerID == HuaweiCloud {
|
||||
if err == nil {
|
||||
t.Fatal("无效的华为云区域应被拒绝")
|
||||
}
|
||||
if errors.Is(err, ErrProviderUnavailable) {
|
||||
t.Fatalf("华为云已接入,不应返回未开放错误:%v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatalf("创建 Provider 失败:%v", err)
|
||||
}
|
||||
if provider == nil {
|
||||
t.Fatal("创建 Provider 后返回空实例")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestGoogleCloudFactoryRejectsMalformedCredentials(t *testing.T) {
|
||||
_, err := NewLegoFactory().Create(GoogleCloud, map[string]string{
|
||||
"service_account_json": "{}",
|
||||
"project": "test-project",
|
||||
})
|
||||
if err == nil {
|
||||
t.Fatal("格式错误的 Google Cloud 服务账号凭据应被拒绝")
|
||||
}
|
||||
if errors.Is(err, ErrProviderUnavailable) {
|
||||
t.Fatalf("Google Cloud 已接入,不应返回未开放错误:%v", err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user