alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Rename field to IsCAServerCert

Browse source
This commit is contained in:
Mariano Cano 2022-08-11 15:14:26 -07:00
parent 5df1694250
commit 8bd0174251
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
authority/tls.go
View file

@ -615,11 +615,11 @@ func (a *Authority) GetTLSCertificate() (*tls.Certificate, error) {
certTpl.NotAfter = now.Add(24 * time.Hour) certTpl.NotAfter = now.Add(24 * time.Hour)
resp, err := a.x509CAService.CreateCertificate(&casapi.CreateCertificateRequest{ resp, err := a.x509CAService.CreateCertificate(&casapi.CreateCertificateRequest{
Template: certTpl, Template: certTpl,
CSR: cr, CSR: cr,
Lifetime: 24 * time.Hour, Lifetime: 24 * time.Hour,
Backdate: 1 * time.Minute, Backdate: 1 * time.Minute,
IsServerCert: true, IsCAServerCert: true,
}) })
if err != nil { if err != nil {
return fatal(err) return fatal(err)

14
cas/apiv1/requests.go
View file

@ -52,13 +52,13 @@ const (
// CreateCertificateRequest is the request used to sign a new certificate. // CreateCertificateRequest is the request used to sign a new certificate.
type CreateCertificateRequest struct { type CreateCertificateRequest struct {
Template *x509.Certificate Template *x509.Certificate
CSR *x509.CertificateRequest CSR *x509.CertificateRequest
Lifetime time.Duration Lifetime time.Duration
Backdate time.Duration Backdate time.Duration
RequestID string RequestID string
Provisioner *ProvisionerInfo Provisioner *ProvisionerInfo
IsServerCert bool IsCAServerCert bool
} }
// ProvisionerInfo contains information of the provisioner used to authorize a // ProvisionerInfo contains information of the provisioner used to authorize a

2
cas/stepcas/stepcas.go
View file

@ -78,7 +78,7 @@ func (s *StepCAS) CreateCertificate(req *apiv1.CreateCertificateRequest) (*apiv1
info := &raInfo{ info := &raInfo{
AuthorityID: s.authorityID, AuthorityID: s.authorityID,
} }
if req.IsServerCert { if req.IsCAServerCert {
info.EndpointID = newServerEndpointID(s.authorityID).String() info.EndpointID = newServerEndpointID(s.authorityID).String()
} }
if p := req.Provisioner; p != nil { if p := req.Provisioner; p != nil {

6
cas/stepcas/stepcas_test.go
View file

@ -673,9 +673,9 @@ func TestStepCAS_CreateCertificate(t *testing.T) {
CertificateChain: []*x509.Certificate{testIssCrt}, CertificateChain: []*x509.Certificate{testIssCrt},
}, false}, }, false},
{"ok with server cert", fields{jwk, client, testRootFingerprint}, args{&apiv1.CreateCertificateRequest{ {"ok with server cert", fields{jwk, client, testRootFingerprint}, args{&apiv1.CreateCertificateRequest{
CSR: testCR, CSR: testCR,
Lifetime: time.Hour, Lifetime: time.Hour,
IsServerCert: true, IsCAServerCert: true,
}}, &apiv1.CreateCertificateResponse{ }}, &apiv1.CreateCertificateResponse{
Certificate: testCrt, Certificate: testCrt,
CertificateChain: []*x509.Certificate{testIssCrt}, CertificateChain: []*x509.Certificate{testIssCrt},