TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-22 06:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

创建和修改证书的时候检查时间

Browse Source
This commit is contained in:
GoEdgeLab
2022-04-19 11:09:42 +08:00
parent 2e3a60ae47
commit f5a40b6956
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/rpc/services/service_ssl_cert.go
View File

@@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/db/models"
"github.com/TeaOSLab/EdgeAPI/internal/db/models/acme" "github.com/TeaOSLab/EdgeAPI/internal/db/models/acme"
"github.com/TeaOSLab/EdgeAPI/internal/errors"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
"github.com/iwind/TeaGo/types" "github.com/iwind/TeaGo/types"
@@ -23,7 +24,14 @@ func (this *SSLCertService) CreateSSLCert(ctx context.Context, req *pb.CreateSSL
return nil, err return nil, err
} }
tx := this.NullTx() var tx = this.NullTx()
if req.TimeBeginAt < 0 {
return nil, errors.New("invalid TimeBeginAt")
}
if req.TimeEndAt < 0 {
return nil, errors.New("invalid TimeEndAt")
}
certId, err := models.SharedSSLCertDAO.CreateCert(tx, adminId, userId, req.IsOn, req.Name, req.Description, req.ServerName, req.IsCA, req.CertData, req.KeyData, req.TimeBeginAt, req.TimeEndAt, req.DnsNames, req.CommonNames) certId, err := models.SharedSSLCertDAO.CreateCert(tx, adminId, userId, req.IsOn, req.Name, req.Description, req.ServerName, req.IsCA, req.CertData, req.KeyData, req.TimeBeginAt, req.TimeEndAt, req.DnsNames, req.CommonNames)
if err != nil { if err != nil {
@@ -41,7 +49,14 @@ func (this *SSLCertService) UpdateSSLCert(ctx context.Context, req *pb.UpdateSSL
return nil, err return nil, err
} }
tx := this.NullTx() var tx = this.NullTx()
if req.TimeBeginAt < 0 {
return nil, errors.New("invalid TimeBeginAt")
}
if req.TimeEndAt < 0 {
return nil, errors.New("invalid TimeEndAt")
}
// 检查权限 // 检查权限
if userId > 0 { if userId > 0 {