e0e957731b
* Rename revokeCert variable to identify serial number formatting * Refactor out lease specific behavior out of revokeCert - Isolate the specific behavior regarding revoking lease specific certificates outside of the revokeCert function and into the only caller that leveraged used it. - This allows us to simplify revokeCert a little bit and keeps the function purely about revoking a certificate * Within revokeCert short circuit the already revoked use-case - Make the function a little easier to process by exiting early if the certificate has already been revoked. * Do not load certificates from storage multiple times during revocation - Isolate the loading of a certificate and parsing of a certificate into a single attempt, either when provided the certificate for BYOC revocation or strictly from storage for the other revocation types. * With BYOC write certificate entry using dashes not the legacy colon char
78 lines
2.1 KiB
Go
78 lines
2.1 KiB
Go
package pki
|
|
|
|
import (
|
|
"context"
|
|
"crypto/x509"
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/vault/sdk/framework"
|
|
"github.com/hashicorp/vault/sdk/logical"
|
|
)
|
|
|
|
// SecretCertsType is the name used to identify this type
|
|
const SecretCertsType = "pki"
|
|
|
|
func secretCerts(b *backend) *framework.Secret {
|
|
return &framework.Secret{
|
|
Type: SecretCertsType,
|
|
Fields: map[string]*framework.FieldSchema{
|
|
"certificate": {
|
|
Type: framework.TypeString,
|
|
Description: `The PEM-encoded concatenated certificate and
|
|
issuing certificate authority`,
|
|
},
|
|
"private_key": {
|
|
Type: framework.TypeString,
|
|
Description: "The PEM-encoded private key for the certificate",
|
|
},
|
|
"serial": {
|
|
Type: framework.TypeString,
|
|
Description: `The serial number of the certificate, for handy
|
|
reference`,
|
|
},
|
|
},
|
|
|
|
Revoke: b.secretCredsRevoke,
|
|
}
|
|
}
|
|
|
|
func (b *backend) secretCredsRevoke(ctx context.Context, req *logical.Request, _ *framework.FieldData) (*logical.Response, error) {
|
|
if req.Secret == nil {
|
|
return nil, fmt.Errorf("secret is nil in request")
|
|
}
|
|
|
|
serialInt, ok := req.Secret.InternalData["serial_number"]
|
|
if !ok {
|
|
return nil, fmt.Errorf("could not find serial in internal secret data")
|
|
}
|
|
|
|
b.revokeStorageLock.Lock()
|
|
defer b.revokeStorageLock.Unlock()
|
|
|
|
sc := b.makeStorageContext(ctx, req.Storage)
|
|
|
|
certEntry, err := fetchCertBySerial(sc, "certs/", serialInt.(string))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if certEntry == nil {
|
|
// We can't write to revoked/ or update the CRL anyway because we don't have the cert,
|
|
// and there's no reason to expect this will work on a subsequent
|
|
// retry. Just give up and let the lease get deleted.
|
|
b.Logger().Warn("expired certificate revoke failed because not found in storage, treating as success", "serial", serialInt.(string))
|
|
return nil, nil
|
|
}
|
|
|
|
cert, err := x509.ParseCertificate(certEntry.Value)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing certificate: %w", err)
|
|
}
|
|
|
|
// Compatibility: Don't revoke CAs if they had leases. New CAs going forward aren't issued leases.
|
|
if cert.IsCA {
|
|
return nil, nil
|
|
}
|
|
|
|
return revokeCert(sc, cert)
|
|
}
|