8acbf7f480
* Add PSS signature support to Vault PKI engine Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Use issuer's RevocationSigAlg for CRL signing We introduce a new parameter on issuers, revocation_signature_algorithm to control the signature algorithm used during CRL signing. This is because the SignatureAlgorithm value from the certificate itself is incorrect for this purpose: a RSA root could sign an ECDSA intermediate with say, SHA256WithRSA, but when the intermediate goes to sign a CRL, it must use ECDSAWithSHA256 or equivalent instead of SHA256WithRSA. When coupled with support for PSS-only keys, allowing the user to set the signature algorithm value as desired seems like the best approach. Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Add use_pss, revocation_signature_algorithm docs Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Add PSS to signature role issuance test matrix Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Add changelog Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Allow roots to self-identify revocation alg When using PSS support with a managed key, sometimes the underlying device will not support PKCS#1v1.5 signatures. This results in CRL building failing, unless we update the entry's signature algorithm prior to building the CRL for the new root. With a RSA-type key and use_pss=true, we use the signature bits value to decide which hash function to use for PSS support. Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Add clearer error message on failed import When CRL building fails during cert/key import, due to PSS failures, give a better indication to the user that import succeeded its just CRL building that failed. This tells them the parameter to adjust on the issuer and warns that CRL building will fail until this is fixed. Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Add case insensitive SigAlgo matching Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Convert UsePSS back to regular bool Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Refactor PSS->certTemplate into helper function Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Proper string output on rev_sig_alg display Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com> * Copy root's SignatureAlgorithm for CRL building Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
315 lines
11 KiB
Go
315 lines
11 KiB
Go
package pki
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/vault/sdk/framework"
|
|
"github.com/hashicorp/vault/sdk/logical"
|
|
)
|
|
|
|
func pathIssuerGenerateRoot(b *backend) *framework.Path {
|
|
return buildPathGenerateRoot(b, "issuers/generate/root/"+framework.GenericNameRegex("exported"))
|
|
}
|
|
|
|
func pathRotateRoot(b *backend) *framework.Path {
|
|
return buildPathGenerateRoot(b, "root/rotate/"+framework.GenericNameRegex("exported"))
|
|
}
|
|
|
|
func buildPathGenerateRoot(b *backend, pattern string) *framework.Path {
|
|
ret := &framework.Path{
|
|
Pattern: pattern,
|
|
|
|
Operations: map[logical.Operation]framework.OperationHandler{
|
|
logical.UpdateOperation: &framework.PathOperation{
|
|
Callback: b.pathCAGenerateRoot,
|
|
// Read more about why these flags are set in backend.go
|
|
ForwardPerformanceStandby: true,
|
|
ForwardPerformanceSecondary: true,
|
|
},
|
|
},
|
|
|
|
HelpSynopsis: pathGenerateRootHelpSyn,
|
|
HelpDescription: pathGenerateRootHelpDesc,
|
|
}
|
|
|
|
ret.Fields = addCACommonFields(map[string]*framework.FieldSchema{})
|
|
ret.Fields = addCAKeyGenerationFields(ret.Fields)
|
|
ret.Fields = addCAIssueFields(ret.Fields)
|
|
return ret
|
|
}
|
|
|
|
func pathIssuerGenerateIntermediate(b *backend) *framework.Path {
|
|
return buildPathGenerateIntermediate(b,
|
|
"issuers/generate/intermediate/"+framework.GenericNameRegex("exported"))
|
|
}
|
|
|
|
func pathCrossSignIntermediate(b *backend) *framework.Path {
|
|
return buildPathGenerateIntermediate(b, "intermediate/cross-sign")
|
|
}
|
|
|
|
func buildPathGenerateIntermediate(b *backend, pattern string) *framework.Path {
|
|
ret := &framework.Path{
|
|
Pattern: pattern,
|
|
Operations: map[logical.Operation]framework.OperationHandler{
|
|
logical.UpdateOperation: &framework.PathOperation{
|
|
Callback: b.pathGenerateIntermediate,
|
|
// Read more about why these flags are set in backend.go
|
|
ForwardPerformanceStandby: true,
|
|
ForwardPerformanceSecondary: true,
|
|
},
|
|
},
|
|
|
|
HelpSynopsis: pathGenerateIntermediateHelpSyn,
|
|
HelpDescription: pathGenerateIntermediateHelpDesc,
|
|
}
|
|
|
|
ret.Fields = addCACommonFields(map[string]*framework.FieldSchema{})
|
|
ret.Fields = addCAKeyGenerationFields(ret.Fields)
|
|
ret.Fields["add_basic_constraints"] = &framework.FieldSchema{
|
|
Type: framework.TypeBool,
|
|
Description: `Whether to add a Basic Constraints
|
|
extension with CA: true. Only needed as a
|
|
workaround in some compatibility scenarios
|
|
with Active Directory Certificate Services.`,
|
|
}
|
|
|
|
// Signature bits isn't respected on intermediate generation, as this
|
|
// only impacts the CSR's internal signature and doesn't impact the
|
|
// signed certificate's bits (that's on the /sign-intermediate
|
|
// endpoints). Remove it from the list of fields to avoid confusion.
|
|
delete(ret.Fields, "signature_bits")
|
|
delete(ret.Fields, "use_pss")
|
|
|
|
return ret
|
|
}
|
|
|
|
func pathImportIssuer(b *backend) *framework.Path {
|
|
return &framework.Path{
|
|
Pattern: "issuers/import/(cert|bundle)",
|
|
Fields: map[string]*framework.FieldSchema{
|
|
"pem_bundle": {
|
|
Type: framework.TypeString,
|
|
Description: `PEM-format, concatenated unencrypted
|
|
secret-key (optional) and certificates.`,
|
|
},
|
|
},
|
|
|
|
Operations: map[logical.Operation]framework.OperationHandler{
|
|
logical.UpdateOperation: &framework.PathOperation{
|
|
Callback: b.pathImportIssuers,
|
|
// Read more about why these flags are set in backend.go
|
|
ForwardPerformanceStandby: true,
|
|
ForwardPerformanceSecondary: true,
|
|
},
|
|
},
|
|
|
|
HelpSynopsis: pathImportIssuersHelpSyn,
|
|
HelpDescription: pathImportIssuersHelpDesc,
|
|
}
|
|
}
|
|
|
|
func (b *backend) pathImportIssuers(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
|
|
// Since we're planning on updating issuers here, grab the lock so we've
|
|
// got a consistent view.
|
|
b.issuersLock.Lock()
|
|
defer b.issuersLock.Unlock()
|
|
|
|
keysAllowed := strings.HasSuffix(req.Path, "bundle") || req.Path == "config/ca"
|
|
|
|
if b.useLegacyBundleCaStorage() {
|
|
return logical.ErrorResponse("Can not import issuers until migration has completed"), nil
|
|
}
|
|
|
|
var pemBundle string
|
|
var certificate string
|
|
rawPemBundle, bundleOk := data.GetOk("pem_bundle")
|
|
rawCertificate, certOk := data.GetOk("certificate")
|
|
if bundleOk {
|
|
pemBundle = rawPemBundle.(string)
|
|
}
|
|
if certOk {
|
|
certificate = rawCertificate.(string)
|
|
}
|
|
|
|
if len(pemBundle) == 0 && len(certificate) == 0 {
|
|
return logical.ErrorResponse("'pem_bundle' and 'certificate' parameters were empty"), nil
|
|
}
|
|
if len(pemBundle) > 0 && len(certificate) > 0 {
|
|
return logical.ErrorResponse("'pem_bundle' and 'certificate' parameters were both provided"), nil
|
|
}
|
|
if len(certificate) > 0 {
|
|
keysAllowed = false
|
|
pemBundle = certificate
|
|
}
|
|
if len(pemBundle) < 75 {
|
|
// It is almost nearly impossible to store a complete certificate in
|
|
// less than 75 bytes. It is definitely impossible to do so when PEM
|
|
// encoding has been applied. Detect this and give a better warning
|
|
// than "provided PEM block contained no data" in this case. This is
|
|
// because the PEM headers contain 5*4 + 6 + 4 + 2 + 2 = 34 characters
|
|
// minimum (five dashes, "BEGIN" + space + at least one character
|
|
// identifier, "END" + space + at least one character identifier, and
|
|
// a pair of new lines). That would leave 41 bytes for Base64 data,
|
|
// meaning at most a 30-byte DER certificate.
|
|
//
|
|
// However, < 75 bytes is probably a good length for a file path so
|
|
// suggest that is the case.
|
|
return logical.ErrorResponse("provided data for import was too short; perhaps a path was passed to the API rather than the contents of a PEM file"), nil
|
|
}
|
|
|
|
var createdKeys []string
|
|
var createdIssuers []string
|
|
issuerKeyMap := make(map[string]string)
|
|
|
|
// Rather than using certutil.ParsePEMBundle (which restricts the
|
|
// construction of the PEM bundle), we manually parse the bundle instead.
|
|
pemBytes := []byte(pemBundle)
|
|
var pemBlock *pem.Block
|
|
|
|
var issuers []string
|
|
var keys []string
|
|
|
|
// By decoding and re-encoding PEM blobs, we can pass strict PEM blobs
|
|
// to the import functionality (importKeys, importIssuers). This allows
|
|
// them to validate no duplicate issuers exist (and place greater
|
|
// restrictions during parsing) but allows this code to accept OpenSSL
|
|
// parsed chains (with full textual output between PEM entries).
|
|
for len(bytes.TrimSpace(pemBytes)) > 0 {
|
|
pemBlock, pemBytes = pem.Decode(pemBytes)
|
|
if pemBlock == nil {
|
|
return logical.ErrorResponse("provided PEM block contained no data"), nil
|
|
}
|
|
|
|
pemBlockString := string(pem.EncodeToMemory(pemBlock))
|
|
|
|
switch pemBlock.Type {
|
|
case "CERTIFICATE", "X509 CERTIFICATE":
|
|
// Must be a certificate
|
|
issuers = append(issuers, pemBlockString)
|
|
case "CRL", "X509 CRL":
|
|
// Ignore any CRL entries.
|
|
default:
|
|
// Otherwise, treat them as keys.
|
|
keys = append(keys, pemBlockString)
|
|
}
|
|
}
|
|
|
|
if len(keys) > 0 && !keysAllowed {
|
|
return logical.ErrorResponse("private keys found in the PEM bundle but not allowed by the path; use /issuers/import/bundle"), nil
|
|
}
|
|
|
|
sc := b.makeStorageContext(ctx, req.Storage)
|
|
|
|
for keyIndex, keyPem := range keys {
|
|
// Handle import of private key.
|
|
key, existing, err := importKeyFromBytes(sc, keyPem, "")
|
|
if err != nil {
|
|
return logical.ErrorResponse(fmt.Sprintf("Error parsing key %v: %v", keyIndex, err)), nil
|
|
}
|
|
|
|
if !existing {
|
|
createdKeys = append(createdKeys, key.ID.String())
|
|
}
|
|
}
|
|
|
|
for certIndex, certPem := range issuers {
|
|
cert, existing, err := sc.importIssuer(certPem, "")
|
|
if err != nil {
|
|
return logical.ErrorResponse(fmt.Sprintf("Error parsing issuer %v: %v\n%v", certIndex, err, certPem)), nil
|
|
}
|
|
|
|
issuerKeyMap[cert.ID.String()] = cert.KeyID.String()
|
|
if !existing {
|
|
createdIssuers = append(createdIssuers, cert.ID.String())
|
|
}
|
|
}
|
|
|
|
response := &logical.Response{
|
|
Data: map[string]interface{}{
|
|
"mapping": issuerKeyMap,
|
|
"imported_keys": createdKeys,
|
|
"imported_issuers": createdIssuers,
|
|
},
|
|
}
|
|
|
|
if len(createdIssuers) > 0 {
|
|
err := b.crlBuilder.rebuild(ctx, b, req, true)
|
|
if err != nil {
|
|
// Before returning, check if the error message includes the
|
|
// string "PSS". If so, it indicates we might've wanted to modify
|
|
// this issuer, so convert the error to a warning.
|
|
if strings.Contains(err.Error(), "PSS") || strings.Contains(err.Error(), "pss") {
|
|
err = fmt.Errorf("Rebuilding the CRL failed with a message relating to the PSS signature algorithm. This likely means the revocation_signature_algorithm needs to be set on the newly imported issuer(s) because a managed key supports only the PSS algorithm; by default PKCS#1v1.5 was used to build the CRLs. CRLs will not be generated until this has been addressed, however the import was successful. The original error is reproduced below:\n\n\t%v", err)
|
|
}
|
|
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// While we're here, check if we should warn about a bad default key. We
|
|
// do this unconditionally if the issuer or key was modified, so the admin
|
|
// is always warned. But if unrelated key material was imported, we do
|
|
// not warn.
|
|
config, err := sc.getIssuersConfig()
|
|
if err == nil && len(config.DefaultIssuerId) > 0 {
|
|
// We can use the mapping above to check the issuer mapping.
|
|
if keyId, ok := issuerKeyMap[string(config.DefaultIssuerId)]; ok && len(keyId) == 0 {
|
|
msg := "The default issuer has no key associated with it. Some operations like issuing certificates and signing CRLs will be unavailable with the requested default issuer until a key is imported or the default issuer is changed."
|
|
response.AddWarning(msg)
|
|
b.Logger().Error(msg)
|
|
}
|
|
|
|
// If we imported multiple issuers with keys (or matched existing
|
|
// keys), and we set one of those as a default, warn the end-user we
|
|
// might have selected the wrong one.
|
|
if len(createdIssuers) > 1 {
|
|
numCreatedIssuersWithKeys := 0
|
|
defaultIssuerWasCreated := false
|
|
for _, issuerId := range createdIssuers {
|
|
if keyId, ok := issuerKeyMap[issuerId]; ok && len(keyId) != 0 {
|
|
numCreatedIssuersWithKeys++
|
|
}
|
|
|
|
if config.DefaultIssuerId.String() == issuerId {
|
|
defaultIssuerWasCreated = true
|
|
}
|
|
}
|
|
|
|
if numCreatedIssuersWithKeys > 1 && defaultIssuerWasCreated {
|
|
msg := "The imported bundle contained multiple certs matching keys, " +
|
|
"the default issuer that was selected should be verified and manually changed if incorrect."
|
|
response.AddWarning(msg)
|
|
b.Logger().Error(msg)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Also while we're here, we should let the user know the next steps.
|
|
// In particular, if there's no default AIA URLs configuration, we should
|
|
// tell the user that's probably next.
|
|
if entries, err := getURLs(ctx, req.Storage); err == nil && len(entries.IssuingCertificates) == 0 && len(entries.CRLDistributionPoints) == 0 && len(entries.OCSPServers) == 0 {
|
|
response.AddWarning("This mount hasn't configured any authority access information fields; this may make it harder for systems to find missing certificates in the chain or to validate revocation status of certificates. Consider updating /config/urls with this information.")
|
|
}
|
|
|
|
return response, nil
|
|
}
|
|
|
|
const (
|
|
pathImportIssuersHelpSyn = `Import the specified issuing certificates.`
|
|
pathImportIssuersHelpDesc = `
|
|
This endpoint allows importing the specified issuer certificates.
|
|
|
|
:type is either the literal value "cert", to only allow importing
|
|
certificates, else "bundle" to allow importing keys as well as
|
|
certificates.
|
|
|
|
Depending on the value of :type, the pem_bundle request parameter can
|
|
either take PEM-formatted certificates, and, if :type="bundle", unencrypted
|
|
secret-keys.
|
|
`
|
|
)
|