1 parent
48f4b24781
commit
a045a0cd17
27 files changed
+1209
-24
No files matched your search
@@ -48,15 +48,19 @@ func NewVault(root string) (*Vault, error) {
|
||||
return nil, ErrVaultUnavailable
|
||||
}
|
||||
}
|
||||
configDir, err := runtimepath.SecureDirectory(root, filepath.Base(runtimepath.KeyDirectory(root)))
|
||||
encryptionDirectory, err := runtimepath.SecureKeyDirectory(root, "external-email-encryption.key")
|
||||
if err != nil {
|
||||
return nil, ErrVaultUnavailable
|
||||
}
|
||||
encryptionKey, err := loadKey(filepath.Join(configDir, "external-email-encryption.key"))
|
||||
fingerprintDirectory, err := runtimepath.SecureKeyDirectory(root, "external-email-fingerprint.key")
|
||||
if err != nil {
|
||||
return nil, ErrVaultUnavailable
|
||||
}
|
||||
fingerprintKey, err := loadKey(filepath.Join(configDir, "external-email-fingerprint.key"))
|
||||
encryptionKey, err := loadKey(filepath.Join(encryptionDirectory, "external-email-encryption.key"))
|
||||
if err != nil {
|
||||
return nil, ErrVaultUnavailable
|
||||
}
|
||||
fingerprintKey, err := loadKey(filepath.Join(fingerprintDirectory, "external-email-fingerprint.key"))
|
||||
if err != nil {
|
||||
return nil, ErrVaultUnavailable
|
||||
}
|
||||
|
||||
@@ -151,6 +151,7 @@ func SetSSL(sslType, priKey, crtKey string) error {
|
||||
return normalizeUserCertificateImportError(err)
|
||||
}
|
||||
applyManagedSSLReference(cfg, reference)
|
||||
defer config.ReleaseStagedSSL(reference)
|
||||
// 导入邮件服务证书不能重新启用反代模式下的内置 HTTPS。
|
||||
if cfg.UsesProxyHTTPS() {
|
||||
cfg.HttpsEnabled = 2
|
||||
@@ -303,6 +304,7 @@ func writeCertificateFiles(cfg *config.Config, privateKey, certificate, issuer [
|
||||
return err
|
||||
}
|
||||
applyManagedSSLReference(&next, reference)
|
||||
defer config.ReleaseStagedSSL(reference)
|
||||
if err := config.WriteSSLConfig(cfg, &next); err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user