1 parent
b3eef54489
commit
391f6bfed6
2 files changed
+74
-1
No files matched your search
@@ -227,7 +227,7 @@ func validateSSLMaterial(privateKeyPEM, certificatePEM, issuerPEM []byte, domain
|
||||
if issuerErr != nil {
|
||||
return ErrInvalidSSLMaterial
|
||||
}
|
||||
certificates = append(certificates, issuerCertificates...)
|
||||
certificates = appendUniqueCertificates(certificates, issuerCertificates...)
|
||||
}
|
||||
if _, err := tls.X509KeyPair(certificatePEM, privateKeyPEM); err != nil {
|
||||
return ErrSSLCertificateMismatch
|
||||
@@ -255,6 +255,28 @@ func validateSSLMaterial(privateKeyPEM, certificatePEM, issuerPEM []byte, domain
|
||||
return nil
|
||||
}
|
||||
|
||||
func appendUniqueCertificates(certificates []*x509.Certificate, additions ...*x509.Certificate) []*x509.Certificate {
|
||||
seen := make(map[string]struct{}, len(certificates)+len(additions))
|
||||
for _, certificate := range certificates {
|
||||
if certificate == nil {
|
||||
continue
|
||||
}
|
||||
seen[string(certificate.Raw)] = struct{}{}
|
||||
}
|
||||
for _, certificate := range additions {
|
||||
if certificate == nil {
|
||||
continue
|
||||
}
|
||||
key := string(certificate.Raw)
|
||||
if _, exists := seen[key]; exists {
|
||||
continue
|
||||
}
|
||||
seen[key] = struct{}{}
|
||||
certificates = append(certificates, certificate)
|
||||
}
|
||||
return certificates
|
||||
}
|
||||
|
||||
func parseCertificatePEM(data []byte) ([]*x509.Certificate, error) {
|
||||
var certificates []*x509.Certificate
|
||||
remaining := data
|
||||
|
||||
Reference in new issue
Block a user