This commit is contained in:
1 parent
e8d4521965
commit
5f62762d97
9 files changed
+217
-21
No files matched your search
@@ -89,11 +89,11 @@ func GetSSL() (string, error) {
|
||||
if cfg.UsesProxyHTTPS() {
|
||||
return config.SSLTypeUser, nil
|
||||
}
|
||||
if cfg.SSLType == "" {
|
||||
if cfg.SSLType == "" && cfg.SSL.Management == "" && cfg.SSL.Mode == "" {
|
||||
return config.SSLTypeAutoHTTP, nil
|
||||
}
|
||||
|
||||
return cfg.SSLType, nil
|
||||
return cfg.EffectiveSSLType(), nil
|
||||
}
|
||||
|
||||
func SetSSL(sslType, priKey, crtKey string) error {
|
||||
@@ -173,6 +173,7 @@ func applyManagedSSLReference(cfg *config.Config, reference config.ManagedSSLRef
|
||||
return
|
||||
}
|
||||
clearLegacySSLPaths(cfg)
|
||||
sslType := cfg.EffectiveSSLType()
|
||||
management := cfg.SSL.Management
|
||||
if reference.Mode == config.ManagedSSLModeDefault {
|
||||
management = config.SSLManagementProject
|
||||
@@ -188,7 +189,7 @@ func applyManagedSSLReference(cfg *config.Config, reference config.ManagedSSLRef
|
||||
}
|
||||
if reference.Mode == config.ManagedSSLModeUpload {
|
||||
cfg.SSL.CustomDirectory = "ssl"
|
||||
} else if cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
} else if sslType == config.SSLTypeAutoDNS {
|
||||
cfg.SSL.Challenge = config.SSLChallengeDNS
|
||||
} else {
|
||||
cfg.SSL.Challenge = config.SSLChallengeHTTP
|
||||
@@ -330,7 +331,7 @@ func certificateMatchesConfiguredDomains(cert *x509.Certificate, cfg *config.Con
|
||||
|
||||
// 自动 DNS 只申请主域泛域名;不覆盖的服务地址是配置错误,不能靠重复续期修复。
|
||||
func validateWildcardConfiguration(cfg *config.Config) error {
|
||||
if cfg == nil || cfg.SSLType != config.SSLTypeAutoDNS {
|
||||
if cfg == nil || cfg.EffectiveSSLType() != config.SSLTypeAutoDNS {
|
||||
return nil
|
||||
}
|
||||
domains := wildcardCertificateDomains(cfg)
|
||||
@@ -370,7 +371,7 @@ func wildcardCertificateDomains(cfg *config.Config) []string {
|
||||
}
|
||||
|
||||
func certificateDomains(cfg *config.Config) []string {
|
||||
if cfg != nil && cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
if cfg != nil && cfg.EffectiveSSLType() == config.SSLTypeAutoDNS {
|
||||
return wildcardCertificateDomains(cfg)
|
||||
}
|
||||
return sslDomains(cfg)
|
||||
@@ -393,12 +394,12 @@ func renewCertificate(privateKey *ecdsa.PrivateKey, cfg *config.Config) error {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
|
||||
if cfg.SSLType == config.SSLTypeAutoHTTP {
|
||||
if cfg.EffectiveSSLType() == config.SSLTypeAutoHTTP {
|
||||
err = client.Challenge.SetHTTP01Provider(GetHttpChallengeInstance())
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
} else if cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
} else if cfg.EffectiveSSLType() == config.SSLTypeAutoDNS {
|
||||
err = client.Challenge.SetDNS01Provider(GetDnsChallengeInstance(), dns01.AddDNSTimeout(60*time.Minute))
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
@@ -456,12 +457,12 @@ func generateCertificate(privateKey *ecdsa.PrivateKey, cfg *config.Config, newAc
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
|
||||
if cfg.SSLType == config.SSLTypeAutoHTTP {
|
||||
if cfg.EffectiveSSLType() == config.SSLTypeAutoHTTP {
|
||||
err = client.Challenge.SetHTTP01Provider(GetHttpChallengeInstance())
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
} else if cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
} else if cfg.EffectiveSSLType() == config.SSLTypeAutoDNS {
|
||||
err = client.Challenge.SetDNS01Provider(GetDnsChallengeInstance(), dns01.AddDNSTimeout(60*time.Minute))
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
package ssl
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/config"
|
||||
)
|
||||
|
||||
type renewalBlockedTransport struct {
|
||||
calls int
|
||||
}
|
||||
|
||||
func (transport *renewalBlockedTransport) RoundTrip(*http.Request) (*http.Response, error) {
|
||||
transport.calls++
|
||||
return nil, errors.New("测试禁止外部网络请求")
|
||||
}
|
||||
|
||||
func TestExternalManagementBlocksAutomaticIssuance(t *testing.T) {
|
||||
previousRoot, previousInstance := config.ROOT_PATH, config.Instance
|
||||
previousSnapshot, previousManager := config.CurrentConfig(), config.CurrentManager()
|
||||
previousTransport := http.DefaultTransport
|
||||
config.SetRuntimeManager(nil)
|
||||
t.Cleanup(func() {
|
||||
config.ROOT_PATH, config.Instance = previousRoot, previousInstance
|
||||
config.PublishConfigSnapshot(previousSnapshot)
|
||||
config.SetRuntimeManager(previousManager)
|
||||
http.DefaultTransport = previousTransport
|
||||
})
|
||||
for _, management := range []string{config.SSLManagementCustom, config.SSLManagementWebServer} {
|
||||
for _, sslType := range []string{config.SSLTypeAutoHTTP, config.SSLTypeAutoDNS} {
|
||||
t.Run(management+sslType, func(t *testing.T) {
|
||||
config.ROOT_PATH = t.TempDir()
|
||||
cfg := &config.Config{
|
||||
SSLType: sslType, SetupState: config.SetupStateReady,
|
||||
SSL: config.SSLConfig{Management: management},
|
||||
}
|
||||
if err := config.WriteConfig(cfg); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
path := filepath.Join(config.ROOT_PATH, "config", "config.json")
|
||||
before, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
transport := &renewalBlockedTransport{}
|
||||
http.DefaultTransport = transport
|
||||
if selected, err := GetSSL(); err != nil || selected != config.SSLTypeUser {
|
||||
t.Fatalf("外部托管仍显示自动签发:type=%s err=%v", selected, err)
|
||||
}
|
||||
for _, update := range []bool{false, true} {
|
||||
if err := GenSSL(update); UserCertificateErrorMessage(err) != "当前证书由外部维护,不能自动申请或续期" {
|
||||
t.Fatalf("外部托管未拒绝签发或续期:%v", err)
|
||||
}
|
||||
}
|
||||
Update(true)
|
||||
after, err := os.ReadFile(path)
|
||||
if err != nil || !bytes.Equal(before, after) || transport.calls != 0 {
|
||||
t.Fatalf("外部托管产生了配置写入或网络请求:calls=%d err=%v", transport.calls, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestProjectDNSReferencePreservesChallenge(t *testing.T) {
|
||||
cfg := &config.Config{SSLType: config.SSLTypeUser, SSL: config.SSLConfig{
|
||||
Management: config.SSLManagementProject, Challenge: config.SSLChallengeDNS,
|
||||
}}
|
||||
applyManagedSSLReference(cfg, config.ManagedSSLReference{Mode: config.ManagedSSLModeDefault})
|
||||
if cfg.SSL.Challenge != config.SSLChallengeDNS || cfg.EffectiveSSLType() != config.SSLTypeAutoDNS {
|
||||
t.Fatal("保存签发结果丢失了项目托管的 DNS 验证方式")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user