修复审查发现的认证配置邮件协议及前端问题
补齐安全运行时清理、配置候选恢复、泛域名证书事务提交、邮件副本与协议边界、插件隐私和安装回滚回归,并更新修复状态及待验收清单。
This commit is contained in:
1 parent
addfcea1cd
commit
6f79441585
71 files changed
+2853
-664
No files matched your search
@@ -62,12 +62,26 @@ type IMAPSearchResult struct {
|
||||
}
|
||||
|
||||
// SearchEmails performs IMAP search based on criteria
|
||||
func SearchEmails(ctx *context.Context, groupName string, criteria *imap.SearchCriteria) ([]*response.UserEmailUIDData, error) {
|
||||
func SearchEmails(ctx *context.Context, groupName string, criteria *imap.SearchCriteria, snapshot ...[]int) ([]*response.UserEmailUIDData, error) {
|
||||
// First get the base list for the mailbox
|
||||
baseList, err := GetUEListByUID(ctx, groupName, 0, 0, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(snapshot) > 0 {
|
||||
sequences := make(map[int]int, len(snapshot[0]))
|
||||
for index, uid := range snapshot[0] {
|
||||
sequences[uid] = index + 1
|
||||
}
|
||||
filtered := make([]*response.UserEmailUIDData, 0, len(baseList))
|
||||
for _, item := range baseList {
|
||||
if sequence := sequences[item.ID]; sequence > 0 {
|
||||
item.SerialNumber = sequence
|
||||
filtered = append(filtered, item)
|
||||
}
|
||||
}
|
||||
baseList = filtered
|
||||
}
|
||||
if len(baseList) == 0 {
|
||||
return baseList, nil
|
||||
}
|
||||
@@ -77,22 +91,34 @@ func SearchEmails(ctx *context.Context, groupName string, criteria *imap.SearchC
|
||||
return baseList, nil
|
||||
}
|
||||
|
||||
// Build UID to sequence number mapping
|
||||
uidToSeq := make(map[int]int)
|
||||
seqToUID := make(map[int]int)
|
||||
// 通配上界来自完整会话快照,不能随其他搜索条件缩小。
|
||||
var maxUID, maxSequence uint32
|
||||
for _, item := range baseList {
|
||||
uidToSeq[item.ID] = item.SerialNumber
|
||||
seqToUID[item.SerialNumber] = item.ID
|
||||
if number, ok := validIMAPNumber(item.ID); ok {
|
||||
maxUID = max(maxUID, number)
|
||||
}
|
||||
if number, ok := validIMAPNumber(item.SerialNumber); ok {
|
||||
maxSequence = max(maxSequence, number)
|
||||
}
|
||||
}
|
||||
if len(snapshot) > 0 {
|
||||
maxUID = 0
|
||||
maxSequence = uint32(len(snapshot[0]))
|
||||
for _, uid := range snapshot[0] {
|
||||
if number, ok := validIMAPNumber(uid); ok {
|
||||
maxUID = max(maxUID, number)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Filter by UID sets
|
||||
if len(criteria.UID) > 0 {
|
||||
baseList = filterByUIDSets(baseList, criteria.UID)
|
||||
baseList = filterByUIDSets(baseList, criteria.UID, maxUID)
|
||||
}
|
||||
|
||||
// Filter by sequence number sets
|
||||
if len(criteria.SeqNum) > 0 {
|
||||
baseList = filterBySeqNumSets(baseList, criteria.SeqNum)
|
||||
baseList = filterBySeqNumSets(baseList, criteria.SeqNum, maxSequence)
|
||||
}
|
||||
|
||||
// For more complex filters, we need to fetch email data
|
||||
@@ -111,7 +137,7 @@ func SearchEmails(ctx *context.Context, groupName string, criteria *imap.SearchC
|
||||
// Handle NOT criteria
|
||||
if len(criteria.Not) > 0 {
|
||||
for _, notCriteria := range criteria.Not {
|
||||
baseList, err = applyNotCriteria(ctx, groupName, baseList, ¬Criteria)
|
||||
baseList, err = applyNotCriteria(ctx, groupName, baseList, ¬Criteria, snapshot...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("apply NOT criteria: %w", err)
|
||||
}
|
||||
@@ -120,7 +146,7 @@ func SearchEmails(ctx *context.Context, groupName string, criteria *imap.SearchC
|
||||
|
||||
// Handle OR criteria
|
||||
if len(criteria.Or) > 0 {
|
||||
baseList, err = applyOrCriteria(ctx, groupName, baseList, criteria.Or)
|
||||
baseList, err = applyOrCriteria(ctx, groupName, baseList, criteria.Or, snapshot...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("apply OR criteria: %w", err)
|
||||
}
|
||||
@@ -169,14 +195,26 @@ func validIMAPNumber(value int) (uint32, bool) {
|
||||
}
|
||||
|
||||
// filterByUIDSets filters the list by UID sets
|
||||
func filterByUIDSets(list []*response.UserEmailUIDData, uidSets []imap.UIDSet) []*response.UserEmailUIDData {
|
||||
func filterByUIDSets(list []*response.UserEmailUIDData, uidSets []imap.UIDSet, upper ...uint32) []*response.UserEmailUIDData {
|
||||
var maximum uint32
|
||||
for _, item := range list {
|
||||
if number, ok := validIMAPNumber(item.ID); ok {
|
||||
maximum = max(maximum, number)
|
||||
}
|
||||
}
|
||||
if len(upper) > 0 {
|
||||
maximum = upper[0]
|
||||
}
|
||||
result := list
|
||||
for _, uidSet := range uidSets {
|
||||
filtered := make([]*response.UserEmailUIDData, 0, len(result))
|
||||
for _, item := range result {
|
||||
number, ok := validIMAPNumber(item.ID)
|
||||
if ok && uidSet.Contains(imap.UID(number)) {
|
||||
filtered = append(filtered, item)
|
||||
for _, span := range uidSet {
|
||||
if ok && searchNumberInRange(number, uint32(span.Start), uint32(span.Stop), maximum) {
|
||||
filtered = append(filtered, item)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
result = filtered
|
||||
@@ -185,14 +223,26 @@ func filterByUIDSets(list []*response.UserEmailUIDData, uidSets []imap.UIDSet) [
|
||||
}
|
||||
|
||||
// filterBySeqNumSets filters the list by sequence number sets
|
||||
func filterBySeqNumSets(list []*response.UserEmailUIDData, seqSets []imap.SeqSet) []*response.UserEmailUIDData {
|
||||
func filterBySeqNumSets(list []*response.UserEmailUIDData, seqSets []imap.SeqSet, upper ...uint32) []*response.UserEmailUIDData {
|
||||
var maximum uint32
|
||||
for _, item := range list {
|
||||
if number, ok := validIMAPNumber(item.SerialNumber); ok {
|
||||
maximum = max(maximum, number)
|
||||
}
|
||||
}
|
||||
if len(upper) > 0 {
|
||||
maximum = upper[0]
|
||||
}
|
||||
result := list
|
||||
for _, seqSet := range seqSets {
|
||||
filtered := make([]*response.UserEmailUIDData, 0, len(result))
|
||||
for _, item := range result {
|
||||
number, ok := validIMAPNumber(item.SerialNumber)
|
||||
if ok && seqSet.Contains(number) {
|
||||
filtered = append(filtered, item)
|
||||
for _, span := range seqSet {
|
||||
if ok && searchNumberInRange(number, span.Start, span.Stop, maximum) {
|
||||
filtered = append(filtered, item)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
result = filtered
|
||||
@@ -200,6 +250,19 @@ func filterBySeqNumSets(list []*response.UserEmailUIDData, seqSets []imap.SeqSet
|
||||
return result
|
||||
}
|
||||
|
||||
func searchNumberInRange(number, start, stop, maximum uint32) bool {
|
||||
if start == 0 {
|
||||
start = maximum
|
||||
}
|
||||
if stop == 0 {
|
||||
stop = maximum
|
||||
}
|
||||
if start > stop {
|
||||
start, stop = stop, start
|
||||
}
|
||||
return number >= start && number <= stop
|
||||
}
|
||||
|
||||
// filterByFlags filters by message flags
|
||||
func filterByFlags(list []*response.UserEmailUIDData, flags []imap.Flag, notFlags []imap.Flag) []*response.UserEmailUIDData {
|
||||
var result []*response.UserEmailUIDData
|
||||
@@ -285,7 +348,11 @@ func filterWithEmailData(ctx *context.Context, list []*response.UserEmailUIDData
|
||||
continue
|
||||
}
|
||||
|
||||
if matchesEmailCriteria(email, criteria) {
|
||||
visible := *email
|
||||
if visible.Type == 0 {
|
||||
visible.Bcc = ""
|
||||
}
|
||||
if matchesEmailCriteria(&visible, criteria) {
|
||||
result = append(result, item)
|
||||
}
|
||||
}
|
||||
@@ -433,9 +500,9 @@ func matchesText(email *models.Email, pattern string) bool {
|
||||
}
|
||||
|
||||
// applyNotCriteria applies NOT criteria
|
||||
func applyNotCriteria(ctx *context.Context, groupName string, list []*response.UserEmailUIDData, notCriteria *imap.SearchCriteria) ([]*response.UserEmailUIDData, error) {
|
||||
func applyNotCriteria(ctx *context.Context, groupName string, list []*response.UserEmailUIDData, notCriteria *imap.SearchCriteria, snapshot ...[]int) ([]*response.UserEmailUIDData, error) {
|
||||
// Get the list of items that match the NOT criteria
|
||||
matchedList, err := SearchEmails(ctx, groupName, notCriteria)
|
||||
matchedList, err := SearchEmails(ctx, groupName, notCriteria, snapshot...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -458,7 +525,7 @@ func applyNotCriteria(ctx *context.Context, groupName string, list []*response.U
|
||||
}
|
||||
|
||||
// applyOrCriteria applies OR criteria
|
||||
func applyOrCriteria(ctx *context.Context, groupName string, list []*response.UserEmailUIDData, orCriteria [][2]imap.SearchCriteria) ([]*response.UserEmailUIDData, error) {
|
||||
func applyOrCriteria(ctx *context.Context, groupName string, list []*response.UserEmailUIDData, orCriteria [][2]imap.SearchCriteria, snapshot ...[]int) ([]*response.UserEmailUIDData, error) {
|
||||
if len(orCriteria) == 0 {
|
||||
return list, nil
|
||||
}
|
||||
@@ -472,7 +539,7 @@ func applyOrCriteria(ctx *context.Context, groupName string, list []*response.Us
|
||||
for _, pair := range orCriteria {
|
||||
pairUIDs := make(map[int]bool)
|
||||
// Get matches for first condition
|
||||
matches1, err := SearchEmails(ctx, groupName, &pair[0])
|
||||
matches1, err := SearchEmails(ctx, groupName, &pair[0], snapshot...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -483,7 +550,7 @@ func applyOrCriteria(ctx *context.Context, groupName string, list []*response.Us
|
||||
}
|
||||
|
||||
// Get matches for second condition
|
||||
matches2, err := SearchEmails(ctx, groupName, &pair[1])
|
||||
matches2, err := SearchEmails(ctx, groupName, &pair[1], snapshot...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -342,6 +342,9 @@ func hydrateIMAPEmailResponses(relations []*response.UserEmailUIDData) ([]*respo
|
||||
continue
|
||||
}
|
||||
copyMessage := *message
|
||||
if copyMessage.Type == consts.EmailTypeReceive {
|
||||
copyMessage.Bcc = "[]"
|
||||
}
|
||||
copyMessage.IsRead = relation.IsRead
|
||||
copyMessage.IsDeleted = relation.IsDeleted
|
||||
copyMessage.SerialNumber = relation.SerialNumber
|
||||
|
||||
@@ -100,6 +100,8 @@ func (s *Service) SetWebAuthnVerifier(verifier WebAuthnVerifier) {
|
||||
if s == nil {
|
||||
return
|
||||
}
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
s.webauthn = verifier
|
||||
}
|
||||
|
||||
@@ -107,14 +109,36 @@ func (s *Service) SetSecurityStateInvalidator(invalidator func(int, string)) {
|
||||
if s == nil {
|
||||
return
|
||||
}
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
s.invalidate = invalidator
|
||||
}
|
||||
|
||||
func (s *Service) currentWebAuthnVerifier() WebAuthnVerifier {
|
||||
if s == nil {
|
||||
return nil
|
||||
}
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
return s.webauthn
|
||||
}
|
||||
|
||||
func (s *Service) invalidateSecurityState(userID int, account string) {
|
||||
s.mu.Lock()
|
||||
invalidator := s.invalidate
|
||||
s.mu.Unlock()
|
||||
// 回调可能重新进入本服务,必须在释放内部锁后调用。
|
||||
if invalidator != nil {
|
||||
invalidator(userID, account)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) BeginWebAuthn(identifier string) (*protocol.CredentialAssertion, string, error) {
|
||||
if s == nil || s.engine == nil || s.webauthn == nil {
|
||||
verifier := s.currentWebAuthnVerifier()
|
||||
if s == nil || s.engine == nil || verifier == nil {
|
||||
return nil, "", ErrUnavailable
|
||||
}
|
||||
options, sessionID, err := s.webauthn.BeginDiscoverableLogin()
|
||||
options, sessionID, err := verifier.BeginDiscoverableLogin()
|
||||
if err != nil {
|
||||
return nil, "", ErrRecoveryDenied
|
||||
}
|
||||
@@ -122,10 +146,11 @@ func (s *Service) BeginWebAuthn(identifier string) (*protocol.CredentialAssertio
|
||||
}
|
||||
|
||||
func (s *Service) VerifyWebAuthn(identifier, sessionID string, request *http.Request) (string, error) {
|
||||
if s == nil || s.engine == nil || s.webauthn == nil || request == nil || strings.TrimSpace(sessionID) == "" {
|
||||
verifier := s.currentWebAuthnVerifier()
|
||||
if s == nil || s.engine == nil || verifier == nil || request == nil || strings.TrimSpace(sessionID) == "" {
|
||||
return "", ErrInvalidRequest
|
||||
}
|
||||
user, _, err := s.webauthn.FinishDiscoverableLogin(sessionID, request)
|
||||
user, _, err := verifier.FinishDiscoverableLogin(sessionID, request)
|
||||
if err != nil || user == nil {
|
||||
return "", ErrRecoveryDenied
|
||||
}
|
||||
@@ -137,10 +162,11 @@ func (s *Service) VerifyWebAuthn(identifier, sessionID string, request *http.Req
|
||||
}
|
||||
|
||||
func (s *Service) VerifyWebAuthnWithContext(identifier, sessionID string, request *http.Request, browserContext string) (string, error) {
|
||||
if s == nil || s.engine == nil || s.webauthn == nil || request == nil || strings.TrimSpace(sessionID) == "" {
|
||||
verifier := s.currentWebAuthnVerifier()
|
||||
if s == nil || s.engine == nil || verifier == nil || request == nil || strings.TrimSpace(sessionID) == "" {
|
||||
return "", ErrInvalidRequest
|
||||
}
|
||||
user, credential, err := s.webauthn.FinishDiscoverableLogin(sessionID, request)
|
||||
user, credential, err := verifier.FinishDiscoverableLogin(sessionID, request)
|
||||
if err != nil || user == nil || credential == nil {
|
||||
return "", ErrRecoveryDenied
|
||||
}
|
||||
@@ -314,7 +340,7 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
|
||||
defer clearString(&hash)
|
||||
var user models.User
|
||||
has, err := s.engine.ID(item.UserID).Get(&user)
|
||||
if err != nil || !has || user.EffectiveRole() == access.RoleSuperAdmin || user.SessionVersion != item.SessionVersion {
|
||||
if err != nil || !has || user.Disabled != 0 || user.EffectiveRole() == access.RoleSuperAdmin || user.SessionVersion != item.SessionVersion {
|
||||
return ErrRecoveryDenied
|
||||
}
|
||||
if item.Method == "email" {
|
||||
@@ -350,7 +376,7 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
|
||||
if err := session.Begin(); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := session.ID(item.UserID).Cols("password", "session_version", "security_version", "must_change_password", "password_changed_at").Update(&models.User{
|
||||
if affected, err := session.ID(item.UserID).Where("session_version = ? AND security_version = ? AND disabled = 0", item.SessionVersion, user.SecurityVersion).Cols("password", "session_version", "security_version", "must_change_password", "password_changed_at").Update(&models.User{
|
||||
Password: hash,
|
||||
SessionVersion: version,
|
||||
SecurityVersion: securityVersion,
|
||||
@@ -359,6 +385,9 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
|
||||
}); err != nil {
|
||||
_ = session.Rollback()
|
||||
return err
|
||||
} else if affected != 1 {
|
||||
_ = session.Rollback()
|
||||
return ErrRecoveryDenied
|
||||
}
|
||||
if err := s.credentials.RevokeAllWithSession(session, item.UserID); err != nil {
|
||||
_ = session.Rollback()
|
||||
@@ -371,9 +400,7 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
|
||||
if s.verification != nil && s.verification.Store != nil {
|
||||
_ = s.verification.Store.InvalidateAccount(user.Account)
|
||||
}
|
||||
if s.invalidate != nil {
|
||||
s.invalidate(item.UserID, user.Account)
|
||||
}
|
||||
s.invalidateSecurityState(item.UserID, user.Account)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -98,6 +98,7 @@ func SetSSL(sslType, priKey, crtKey string) error {
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
expected := *cfg
|
||||
if sslType == config.SSLTypeAutoHTTP || sslType == config.SSLTypeUser || sslType == config.SSLTypeAutoDNS {
|
||||
cfg.SSLType = sslType
|
||||
} else {
|
||||
@@ -110,6 +111,14 @@ func SetSSL(sslType, priKey, crtKey string) error {
|
||||
Mode: config.ManagedSSLModeDefault,
|
||||
DefaultDirectory: "config/ssl",
|
||||
}
|
||||
if cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
cfg.SSL.Challenge = config.SSLChallengeDNS
|
||||
if err := validateWildcardConfiguration(cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
cfg.SSL.Challenge = config.SSLChallengeHTTP
|
||||
}
|
||||
}
|
||||
if cfg.SSLType == config.SSLTypeUser {
|
||||
privatePath, publicPath, err := validateUserCertificatePaths(priKey, crtKey)
|
||||
@@ -124,7 +133,7 @@ func SetSSL(sslType, priKey, crtKey string) error {
|
||||
if err != nil {
|
||||
return newUserCertificateError("SSL 证书无法读取,请确认文件路径和 smail 用户权限")
|
||||
}
|
||||
reference, err := config.ImportManagedSSL(config.ManagedSSLModeUpload, privatePEM, publicPEM, nil, sslDomains(cfg))
|
||||
reference, err := config.StageManagedSSL(config.ManagedSSLModeUpload, privatePEM, publicPEM, nil, sslDomains(cfg))
|
||||
if err != nil {
|
||||
return normalizeUserCertificateImportError(err)
|
||||
}
|
||||
@@ -133,7 +142,7 @@ func SetSSL(sslType, priKey, crtKey string) error {
|
||||
cfg.HttpsEnabled = 1
|
||||
}
|
||||
|
||||
err = config.WriteConfig(cfg)
|
||||
err = config.WriteSSLConfig(&expected, cfg)
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
@@ -164,6 +173,10 @@ func applyManagedSSLReference(cfg *config.Config, reference config.ManagedSSLRef
|
||||
}
|
||||
if reference.Mode == config.ManagedSSLModeUpload {
|
||||
cfg.SSL.CustomDirectory = "config/ssl/managed/upload"
|
||||
} else if cfg.SSLType == config.SSLTypeAutoDNS {
|
||||
cfg.SSL.Challenge = config.SSLChallengeDNS
|
||||
} else {
|
||||
cfg.SSL.Challenge = config.SSLChallengeHTTP
|
||||
}
|
||||
}
|
||||
|
||||
@@ -257,14 +270,19 @@ func writeCertificateFiles(cfg *config.Config, privateKey, certificate, issuer [
|
||||
if cfg == nil {
|
||||
return errors.New("SSL 配置不能为空")
|
||||
}
|
||||
reference, err := config.ImportManagedSSL(config.ManagedSSLModeDefault, privateKey, certificate, issuer, certificateDomains(cfg))
|
||||
if err := validateWildcardConfiguration(cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
next := *cfg
|
||||
reference, err := config.StageManagedSSL(config.ManagedSSLModeDefault, privateKey, certificate, issuer, certificateDomains(cfg))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
applyManagedSSLReference(cfg, reference)
|
||||
if err := config.WriteConfig(cfg); err != nil {
|
||||
applyManagedSSLReference(&next, reference)
|
||||
if err := config.WriteSSLConfig(cfg, &next); err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
*cfg = next
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -300,13 +318,43 @@ func certificateMatchesConfiguredDomains(cert *x509.Certificate, cfg *config.Con
|
||||
if cert == nil || cfg == nil {
|
||||
return false
|
||||
}
|
||||
for _, domain := range sslDomains(cfg) {
|
||||
if validateWildcardConfiguration(cfg) != nil {
|
||||
return false
|
||||
}
|
||||
for _, domain := range certificateDomains(cfg) {
|
||||
if err := cert.VerifyHostname(domain); err != nil {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// 自动 DNS 只申请主域泛域名;不覆盖的服务地址是配置错误,不能靠重复续期修复。
|
||||
func validateWildcardConfiguration(cfg *config.Config) error {
|
||||
if cfg == nil || cfg.SSLType != config.SSLTypeAutoDNS {
|
||||
return nil
|
||||
}
|
||||
domains := wildcardCertificateDomains(cfg)
|
||||
if len(domains) != 1 {
|
||||
return newUserCertificateError("自动 DNS 证书需要有效的主域名")
|
||||
}
|
||||
base := strings.TrimPrefix(domains[0], "*.")
|
||||
covered := func(host string) bool {
|
||||
host = strings.ToLower(strings.TrimSuffix(strings.TrimSpace(host), "."))
|
||||
suffix := "." + strings.ToLower(base)
|
||||
label := strings.TrimSuffix(host, suffix)
|
||||
return strings.HasSuffix(host, suffix) && label != "" && !strings.Contains(label, ".")
|
||||
}
|
||||
if cfg.WebDomain != "" && !covered(cfg.WebDomain) {
|
||||
return newUserCertificateError("Web 域名必须是主域名的一级子域名,泛域名证书不覆盖根域名或多级子域名")
|
||||
}
|
||||
for _, domain := range cfg.Domains {
|
||||
if !covered("smtp."+domain) || !covered("imap."+domain) || !covered("pop."+domain) {
|
||||
return newUserCertificateError("附加邮箱域名的服务地址不在主域泛域名证书覆盖范围内")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func wildcardCertificateDomains(cfg *config.Config) []string {
|
||||
if cfg == nil {
|
||||
return nil
|
||||
@@ -475,6 +523,9 @@ func GenSSL(update bool) error {
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
if err := validateWildcardConfiguration(cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !update {
|
||||
privatePath, publicPath, pathErr := config.ResolveRuntimeSSLPaths(cfg)
|
||||
|
||||
Reference in new issue
Block a user