按证书托管方式统一自动续期策略并补充回归测试
This commit is contained in:
1 parent
e2e35b4800
commit
8a30cae56a
9 files changed
+217
-21
No files matched your search
@@ -7,7 +7,30 @@ func (c *Config) UsesProxyHTTPS() bool {
|
||||
return c != nil && strings.EqualFold(strings.TrimSpace(c.TLSMode), HTTPSTLSModeProxy)
|
||||
}
|
||||
|
||||
// AutomaticSSLEnabled 保留原证书策略,但反代模式下禁止 Smail 自动签发和续期。
|
||||
func (c *Config) AutomaticSSLEnabled() bool {
|
||||
return c != nil && !c.UsesProxyHTTPS() && (c.SSLType == SSLTypeAutoHTTP || c.SSLType == SSLTypeAutoDNS)
|
||||
// EffectiveSSLType 以证书管理责任为准,仅在旧配置未记录管理方式时兼容旧类型。
|
||||
func (c *Config) EffectiveSSLType() string {
|
||||
if c == nil || c.UsesProxyHTTPS() {
|
||||
return SSLTypeUser
|
||||
}
|
||||
management := c.SSL.Management
|
||||
if management == "" && c.SSL.Mode != "" {
|
||||
management = EffectiveSSLManagement(c.SSL)
|
||||
}
|
||||
switch management {
|
||||
case SSLManagementProject:
|
||||
if c.SSL.Challenge == SSLChallengeDNS || (c.SSL.Challenge == "" && c.SSLType == SSLTypeAutoDNS) {
|
||||
return SSLTypeAutoDNS
|
||||
}
|
||||
return SSLTypeAutoHTTP
|
||||
case "":
|
||||
if c.SSLType == SSLTypeAutoHTTP || c.SSLType == SSLTypeAutoDNS {
|
||||
return c.SSLType
|
||||
}
|
||||
}
|
||||
return SSLTypeUser
|
||||
}
|
||||
|
||||
// AutomaticSSLEnabled 仅允许项目自托管证书自动签发和续期。
|
||||
func (c *Config) AutomaticSSLEnabled() bool {
|
||||
return c.EffectiveSSLType() != SSLTypeUser
|
||||
}
|
||||
Reference in new issue
Block a user