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

Remove superfluous call to StoreCertificate

Browse source
This commit is contained in:
Herman Slatman 2021-03-26 14:02:52 +01:00
parent 583d60dc0d
commit b97f024f8a
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
4 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ca/ca.go
View file

@ -152,7 +152,6 @@ func (ca *CA) Init(config *authority.Config) (*CA, error) {
scepPrefix := "scep" scepPrefix := "scep"
scepAuthority, err := scep.New(auth, scep.AuthorityOptions{ scepAuthority, err := scep.New(auth, scep.AuthorityOptions{
Service: auth.GetSCEPService(), Service: auth.GetSCEPService(),
DB: auth.GetDatabase().(scep.DB),
DNS: dns, DNS: dns,
Prefix: scepPrefix, Prefix: scepPrefix,
}) })

13
scep/authority.go
View file

@ -34,7 +34,6 @@ type Interface interface {
// Authority is the layer that handles all SCEP interactions. // Authority is the layer that handles all SCEP interactions.
type Authority struct { type Authority struct {
db DB
prefix string prefix string
dns string dns string
intermediateCertificate *x509.Certificate intermediateCertificate *x509.Certificate
@ -46,8 +45,6 @@ type Authority struct {
type AuthorityOptions struct { type AuthorityOptions struct {
// Service provides the certificate chain, the signer and the decrypter to the Authority // Service provides the certificate chain, the signer and the decrypter to the Authority
Service *Service Service *Service
// DB is the database used by SCEP
DB DB
// DNS is the host used to generate accurate SCEP links. By default the authority // DNS is the host used to generate accurate SCEP links. By default the authority
// will use the Host from the request, so this value will only be used if // will use the Host from the request, so this value will only be used if
// request.Host is empty. // request.Host is empty.
@ -67,7 +64,6 @@ type SignAuthority interface {
func New(signAuth SignAuthority, ops AuthorityOptions) (*Authority, error) { func New(signAuth SignAuthority, ops AuthorityOptions) (*Authority, error) {
authority := &Authority{ authority := &Authority{
db: ops.DB,
prefix: ops.Prefix, prefix: ops.Prefix,
dns: ops.DNS, dns: ops.DNS,
signAuth: signAuth, signAuth: signAuth,
@ -341,15 +337,6 @@ func (a *Authority) SignCSR(ctx context.Context, csr *x509.CertificateRequest, m
CertRepMessage: cr, CertRepMessage: cr,
} }
// store the newly created certificate
err = newCert(a.db, CertOptions{
Leaf: certChain[0],
Intermediates: certChain[1:],
})
if err != nil {
return nil, err
}
return crepMsg, nil return crepMsg, nil
} }

21
scep/certificate.go
View file

@ -1,21 +0,0 @@
package scep
import (
"crypto/x509"
"github.com/pkg/errors"
)
// CertOptions options with which to create and store a cert object.
type CertOptions struct {
Leaf *x509.Certificate
Intermediates []*x509.Certificate
}
func newCert(db DB, ops CertOptions) error {
err := db.StoreCertificate(ops.Leaf)
if err != nil {
errors.Wrap(err, "error while storing certificate")
}
return nil
}

7
scep/errors.go
View file

@ -2,18 +2,11 @@ package scep
// Error is an SCEP error type // Error is an SCEP error type
type Error struct { type Error struct {
// Type ProbType
// Detail string
Message string `json:"message"` Message string `json:"message"`
Status int `json:"-"` Status int `json:"-"`
// Sub []*Error
// Identifier *Identifier
} }
// Error implements the error interface. // Error implements the error interface.
func (e *Error) Error() string { func (e *Error) Error() string {
// if e.Err == nil {
// return e.Detail
// }
return e.Message return e.Message
} }