This commit is contained in:
1 parent
dd9d659cb7
commit
9dc861d560
41 files changed
+1408
-198
No files matched your search
@@ -173,6 +173,16 @@ func smtpRelayConfigured(smtp SMTPConfig) bool {
|
||||
}
|
||||
|
||||
func validateSSL(ssl SSLConfig) error {
|
||||
if (ssl.PreviousCertificateRef == "") != (ssl.PreviousPrivateKeyRef == "") {
|
||||
return ErrInvalidSSL
|
||||
}
|
||||
if ssl.PreviousCertificateRef != "" {
|
||||
publicPath, err := resolveCustomSSLInput(".", ssl.PreviousCertificateRef)
|
||||
privatePath, keyErr := resolveCustomSSLInput(".", ssl.PreviousPrivateKeyRef)
|
||||
if err != nil || keyErr != nil || !isControlledRelativePath(ssl.PreviousCertificateRef) || !isControlledRelativePath(ssl.PreviousPrivateKeyRef) || !flatSSLPair(".", publicPath, privatePath) {
|
||||
return ErrInvalidSSL
|
||||
}
|
||||
}
|
||||
if !isControlledRelativePath(ssl.DefaultDirectory) {
|
||||
return ErrInvalidSSL
|
||||
}
|
||||
@@ -196,6 +206,19 @@ func validateSSL(ssl SSLConfig) error {
|
||||
default:
|
||||
return ErrInvalidSSL
|
||||
}
|
||||
if EffectiveSSLManagement(ssl) == SSLManagementCustom || EffectiveSSLManagement(ssl) == SSLManagementWebServer {
|
||||
if (ssl.CertificateRef == "") != (ssl.PrivateKeyRef == "") {
|
||||
return ErrInvalidSSL
|
||||
}
|
||||
for _, value := range []string{ssl.CertificateRef, ssl.PrivateKeyRef} {
|
||||
if value != "" {
|
||||
if _, err := resolveCustomSSLInput(".", value); err != nil {
|
||||
return ErrInvalidSSL
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if (ssl.CertificateRef != "" && !isControlledRelativePath(ssl.CertificateRef)) ||
|
||||
(ssl.PrivateKeyRef != "" && !isControlledRelativePath(ssl.PrivateKeyRef)) {
|
||||
return ErrInvalidSSL
|
||||
|
||||
Reference in new issue
Block a user