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

fix check ca cert

Browse Source
This commit is contained in:
wanyaoqi
2020-04-22 22:07:32 +08:00
parent 6af24165fe
commit 4cf299b0fd
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/servicecertificates.go
+22 -8
View File
@@ -47,10 +47,17 @@ func (man *SServiceCertificateManager) ValidateCreateData(ctx context.Context, u
}
data = v.UpdateCertKeyInfo(ctx, data)
// validate ca cert key
v = validators.NewCertKeyValidator("ca_certificate", "ca_private_key")
if err := v.Validate(data); err != nil {
return nil, err
if caCert, _ := data.GetString("ca_certificate"); len(caCert) > 0 {
vc := validators.NewCertificateValidator("ca_certificate")
if err := vc.Validate(data); err != nil {
return nil, err
}
}
if caPkey, _ := data.GetString("ca_private_key"); len(caPkey) > 0 {
vp := validators.NewPrivateKeyValidator("ca_private_key")
if err := vp.Validate(data); err != nil {
return nil, err
}
}
input := apis.StandaloneResourceCreateInput{}
@@ -76,10 +83,17 @@ func (cert *SServiceCertificate) ValidateUpdateData(
}
data = v.UpdateCertKeyInfo(ctx, data)
// validate ca cert key
v = validators.NewCertKeyValidator("ca_certificate", "ca_private_key")
if err := v.Validate(data); err != nil {
return nil, err
if caCert, _ := data.GetString("ca_certificate"); len(caCert) > 0 {
vc := validators.NewCertificateValidator("ca_certificate")
if err := vc.Validate(data); err != nil {
return nil, err
}
}
if caPkey, _ := data.GetString("ca_private_key"); len(caPkey) > 0 {
vp := validators.NewPrivateKeyValidator("ca_private_key")
if err := vp.Validate(data); err != nil {
return nil, err
}
}
updateData := jsonutils.NewDict()