优化SSL证书三种管理模式
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-07 15:49:25 +08:00
1 parent cfe4401b70
commit 6ad6f449ca
10 files changed
+157 -15

No files matched your search

+5 -1
View File
@@ -736,7 +736,7 @@ func legacySMTPConfig(root string, vault *credential.Vault, legacy legacyMigrati
func legacySSLConfig(legacy legacyMigrationConfig) (SSLConfig, []string) {
certificateRef, certificateOK := legacyControlledReference(legacy.SSLPublicKeyPath)
privateKeyRef, privateKeyOK := legacyControlledReference(legacy.SSLPrivateKeyPath)
ssl := SSLConfig{Mode: ManagedSSLModeDefault, DefaultDirectory: "config/ssl"}
ssl := SSLConfig{Management: SSLManagementProject, Mode: ManagedSSLModeDefault, DefaultDirectory: "config/ssl"}
switch legacy.SSLType {
case SSLTypeAutoDNS:
ssl.Challenge = SSLChallengeDNS
@@ -744,6 +744,10 @@ func legacySSLConfig(legacy legacyMigrationConfig) (SSLConfig, []string) {
ssl.Challenge = SSLChallengeHTTP
}
if legacy.SSLType == SSLTypeUser {
ssl.Management = SSLManagementCustom
if strings.EqualFold(strings.TrimSpace(legacy.TLSMode), HTTPSTLSModeProxy) {
ssl.Management = SSLManagementWebServer
}
ssl.Mode = ManagedSSLModeUpload
ssl.CustomDirectory = "config/ssl"
}
+1
View File
@@ -104,6 +104,7 @@ type EmailConfig struct {
}
type SSLConfig struct {
Management string `json:"management,omitempty"`
Mode string `json:"mode"`
DefaultDirectory string `json:"defaultDirectory"`
CustomDirectory string `json:"customDirectory,omitempty"`
+1 -1
View File
@@ -78,7 +78,7 @@ func runtimeCompatibility(runtime RuntimeConfig) (*Config, error) {
}
}
tls := runtime.SSL.TLS
if tls.Mode == ManagedSSLModeDefault {
if EffectiveSSLManagement(tls) == SSLManagementProject {
if tls.Challenge == SSLChallengeDNS {
cfg.SSLType = SSLTypeAutoDNS
} else {
+58
View File
@@ -0,0 +1,58 @@
package config
import "testing"
func TestEffectiveSSLManagementSupportsThreeBusinessModes(t *testing.T) {
for _, test := range []struct {
name string
ssl SSLConfig
want string
}{
{name: "web_server", ssl: SSLConfig{Management: SSLManagementWebServer, Mode: ManagedSSLModeUpload}, want: SSLManagementWebServer},
{name: "project", ssl: SSLConfig{Management: SSLManagementProject, Mode: ManagedSSLModeDefault}, want: SSLManagementProject},
{name: "custom", ssl: SSLConfig{Management: SSLManagementCustom, Mode: ManagedSSLModeUpload}, want: SSLManagementCustom},
{name: "legacy_project", ssl: SSLConfig{Mode: "default"}, want: SSLManagementProject},
{name: "legacy_custom", ssl: SSLConfig{Mode: "custom"}, want: SSLManagementCustom},
} {
t.Run(test.name, func(t *testing.T) {
if got := EffectiveSSLManagement(test.ssl); got != test.want {
t.Fatalf("management = %q, want %q", got, test.want)
}
})
}
}
func TestValidateSSLManagementMatchesStorageMode(t *testing.T) {
valid := SSLConfig{
Management: SSLManagementProject,
Mode: ManagedSSLModeDefault,
DefaultDirectory: "config/ssl",
Challenge: SSLChallengeHTTP,
}
if err := validateSSL(valid); err != nil {
t.Fatalf("project managed SSL was rejected: %v", err)
}
valid.Management = SSLManagementWebServer
valid.Mode = ManagedSSLModeUpload
valid.CustomDirectory = "config/ssl"
if err := validateSSL(valid); err != nil {
t.Fatalf("web server managed SSL was rejected: %v", err)
}
valid.Management = SSLManagementCustom
if err := validateSSL(valid); err != nil {
t.Fatalf("custom managed SSL was rejected: %v", err)
}
// 管理责任切换时继续使用当前证书,待项目签发成功后再切换底层存储引用。
valid.Management = SSLManagementProject
if err := validateSSL(valid); err != nil {
t.Fatalf("project management rejected the existing certificate during transition: %v", err)
}
valid.Management = "unsupported"
if err := validateSSL(valid); err == nil {
t.Fatal("unsupported SSL management was accepted")
}
legacy := SSLConfig{Mode: "default", DefaultDirectory: "config/ssl"}
if err := validateSSL(legacy); err != nil {
t.Fatalf("legacy SSL configuration without management was rejected: %v", err)
}
}
+22 -2
View File
@@ -19,13 +19,33 @@ import (
)
const (
ManagedSSLModeDefault = "managed_default"
ManagedSSLModeUpload = "managed_upload"
ManagedSSLModeDefault = "managed_default"
ManagedSSLModeUpload = "managed_upload"
SSLManagementWebServer = "web_server"
SSLManagementProject = "project"
SSLManagementCustom = "custom"
managedSSLRelativeRoot = "config/ssl/managed"
maxManagedSSLFileSize = 1 << 20
)
// EffectiveSSLManagement 返回面向用户的证书管理方式,并兼容旧配置中的底层存储模式。
func EffectiveSSLManagement(ssl SSLConfig) string {
switch ssl.Management {
case SSLManagementWebServer, SSLManagementProject, SSLManagementCustom:
return ssl.Management
}
if ssl.Mode == ManagedSSLModeDefault || ssl.Mode == "default" {
return SSLManagementProject
}
return SSLManagementCustom
}
// ValidSSLManagement 判断证书管理责任是否为当前支持的三种业务模式。
func ValidSSLManagement(management string) bool {
return management == SSLManagementWebServer || management == SSLManagementProject || management == SSLManagementCustom
}
var (
ErrInvalidSSLMode = errors.New("invalid SSL managed mode")
ErrInvalidSSLMaterial = errors.New("invalid SSL certificate material")
+3
View File
@@ -171,6 +171,9 @@ func validateSSL(ssl SSLConfig) error {
if !isControlledRelativePath(ssl.DefaultDirectory) {
return ErrInvalidSSL
}
if ssl.Management != "" && !ValidSSLManagement(ssl.Management) {
return ErrInvalidSSL
}
if ssl.Challenge != "" && ssl.Challenge != SSLChallengeHTTP && ssl.Challenge != SSLChallengeDNS {
return ErrInvalidSSL
}