opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #313 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-go-1.9-compat to release/2.3.0

Browse Source 
* commit 'd9173e696e7515085d9c14cf41473cd796fbe646':
  loadbalancercertificates: make code compatible with go-1.9
This commit is contained in:
邱剑
2018-10-18 17:56:51 +08:00
parent a0237e1d0c d9173e696e
commit 4b67ba65ec
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/loadbalancercertificates.go
+16 -4
View File
@@ -2,6 +2,7 @@ package models
import (
"context"
"crypto/x509"
"fmt"
"strings"
"time"
@@ -74,10 +75,21 @@ func (man *SLoadbalancerCertificateManager) validateCertKey(ctx context.Context,
}
}
cert := certV.Certificates[0]
certPubKeyAlgo := cert.PublicKeyAlgorithm.String()
if !LB_TLS_CERT_PUBKEY_ALGOS.Has(certPubKeyAlgo) {
return nil, httperrors.NewInputParameterError("invalid cert pubkey algorithm: %s, want %s",
certPubKeyAlgo, LB_TLS_CERT_PUBKEY_ALGOS.String())
var certPubKeyAlgo string
{
// x509.PublicKeyAlgorithm.String() is only available since go1.10
switch cert.PublicKeyAlgorithm {
case x509.RSA:
certPubKeyAlgo = LB_TLS_CERT_PUBKEY_ALGO_RSA
case x509.ECDSA:
certPubKeyAlgo = LB_TLS_CERT_PUBKEY_ALGO_ECDSA
default:
certPubKeyAlgo = fmt.Sprintf("algo %#v", cert.PublicKeyAlgorithm)
}
if !LB_TLS_CERT_PUBKEY_ALGOS.Has(certPubKeyAlgo) {
return nil, httperrors.NewInputParameterError("invalid cert pubkey algorithm: %s, want %s",
certPubKeyAlgo, LB_TLS_CERT_PUBKEY_ALGOS.String())
}
}
err := pkeyV.MatchCertificate(cert)
if err != nil {