2018-06-13 08:40:03 +00:00
|
|
|
package ca
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2020-09-11 15:41:05 +00:00
|
|
|
"context"
|
2018-06-13 08:40:03 +00:00
|
|
|
"crypto/x509"
|
|
|
|
"encoding/pem"
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"net/http"
|
|
|
|
"strings"
|
2020-10-09 11:35:42 +00:00
|
|
|
"time"
|
2018-06-13 08:40:03 +00:00
|
|
|
|
2020-08-25 17:34:49 +00:00
|
|
|
"github.com/hashicorp/go-hclog"
|
2018-06-13 08:40:03 +00:00
|
|
|
vaultapi "github.com/hashicorp/vault/api"
|
|
|
|
"github.com/mitchellh/mapstructure"
|
2021-06-23 19:47:30 +00:00
|
|
|
|
|
|
|
"github.com/hashicorp/consul/agent/connect"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
|
|
"github.com/hashicorp/consul/logging"
|
2018-06-13 08:40:03 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
const VaultCALeafCertRole = "leaf-cert"
|
|
|
|
|
|
|
|
var ErrBackendNotMounted = fmt.Errorf("backend not mounted")
|
|
|
|
var ErrBackendNotInitialized = fmt.Errorf("backend not initialized")
|
|
|
|
|
|
|
|
type VaultProvider struct {
|
2020-08-25 17:34:49 +00:00
|
|
|
config *structs.VaultCAProviderConfig
|
|
|
|
client *vaultapi.Client
|
2020-09-10 13:12:48 +00:00
|
|
|
|
2020-09-11 15:41:05 +00:00
|
|
|
shutdown func()
|
2020-08-25 17:34:49 +00:00
|
|
|
|
2020-06-05 19:36:22 +00:00
|
|
|
isPrimary bool
|
|
|
|
clusterID string
|
|
|
|
spiffeID *connect.SpiffeIDSigning
|
|
|
|
setupIntermediatePKIPathDone bool
|
2020-08-25 17:34:49 +00:00
|
|
|
logger hclog.Logger
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2020-09-11 15:41:05 +00:00
|
|
|
func NewVaultProvider() *VaultProvider {
|
|
|
|
return &VaultProvider{shutdown: func() {}}
|
|
|
|
}
|
|
|
|
|
2019-01-08 16:09:22 +00:00
|
|
|
func vaultTLSConfig(config *structs.VaultCAProviderConfig) *vaultapi.TLSConfig {
|
|
|
|
return &vaultapi.TLSConfig{
|
|
|
|
CACert: config.CAFile,
|
|
|
|
CAPath: config.CAPath,
|
|
|
|
ClientCert: config.CertFile,
|
|
|
|
ClientKey: config.KeyFile,
|
|
|
|
Insecure: config.TLSSkipVerify,
|
|
|
|
TLSServerName: config.TLSServerName,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-11 23:43:04 +00:00
|
|
|
// Configure sets up the provider using the given configuration.
|
2019-11-18 14:22:19 +00:00
|
|
|
func (v *VaultProvider) Configure(cfg ProviderConfig) error {
|
|
|
|
config, err := ParseVaultCAConfig(cfg.RawConfig)
|
2018-06-13 08:40:03 +00:00
|
|
|
if err != nil {
|
2018-09-07 02:18:54 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2018-06-14 17:56:17 +00:00
|
|
|
clientConf := &vaultapi.Config{
|
2018-09-07 02:18:54 +00:00
|
|
|
Address: config.Address,
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
2019-01-08 16:09:22 +00:00
|
|
|
err = clientConf.ConfigureTLS(vaultTLSConfig(config))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2018-06-14 17:56:17 +00:00
|
|
|
client, err := vaultapi.NewClient(clientConf)
|
|
|
|
if err != nil {
|
2018-09-07 02:18:54 +00:00
|
|
|
return err
|
2018-06-14 17:56:17 +00:00
|
|
|
}
|
|
|
|
|
2018-09-07 02:18:54 +00:00
|
|
|
client.SetToken(config.Token)
|
|
|
|
v.config = config
|
|
|
|
v.client = client
|
2019-11-18 14:22:19 +00:00
|
|
|
v.isPrimary = cfg.IsPrimary
|
|
|
|
v.clusterID = cfg.ClusterID
|
|
|
|
v.spiffeID = connect.SpiffeIDSigningForCluster(&structs.CAConfiguration{ClusterID: v.clusterID})
|
2020-08-25 17:34:49 +00:00
|
|
|
|
|
|
|
// Look up the token to see if we can auto-renew its lease.
|
2020-10-27 20:03:17 +00:00
|
|
|
secret, err := client.Auth().Token().LookupSelf()
|
2020-08-25 17:34:49 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
2021-02-22 20:08:49 +00:00
|
|
|
} else if secret == nil {
|
|
|
|
return fmt.Errorf("Could not look up Vault provider token: not found")
|
2020-08-25 17:34:49 +00:00
|
|
|
}
|
2020-09-10 13:31:04 +00:00
|
|
|
var token struct {
|
|
|
|
Renewable bool
|
|
|
|
TTL int
|
2020-08-25 17:34:49 +00:00
|
|
|
}
|
2020-09-10 13:31:04 +00:00
|
|
|
if err := mapstructure.Decode(secret.Data, &token); err != nil {
|
|
|
|
return err
|
2020-08-25 17:34:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set up a renewer to renew the token automatically, if supported.
|
2020-09-10 13:31:04 +00:00
|
|
|
if token.Renewable {
|
2020-10-09 12:02:18 +00:00
|
|
|
lifetimeWatcher, err := client.NewLifetimeWatcher(&vaultapi.LifetimeWatcherInput{
|
2020-08-25 17:34:49 +00:00
|
|
|
Secret: &vaultapi.Secret{
|
|
|
|
Auth: &vaultapi.SecretAuth{
|
2020-09-09 23:36:37 +00:00
|
|
|
ClientToken: config.Token,
|
2020-09-10 13:31:04 +00:00
|
|
|
Renewable: token.Renewable,
|
2020-09-09 23:36:37 +00:00
|
|
|
LeaseDuration: secret.LeaseDuration,
|
2020-08-25 17:34:49 +00:00
|
|
|
},
|
|
|
|
},
|
2020-10-09 12:02:18 +00:00
|
|
|
Increment: token.TTL,
|
|
|
|
RenewBehavior: vaultapi.RenewBehaviorIgnoreErrors,
|
2020-08-25 17:34:49 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("Error beginning Vault provider token renewal: %v", err)
|
|
|
|
}
|
2020-09-11 15:41:05 +00:00
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.TODO())
|
|
|
|
v.shutdown = cancel
|
2020-10-09 12:02:18 +00:00
|
|
|
go v.renewToken(ctx, lifetimeWatcher)
|
2020-08-25 17:34:49 +00:00
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
|
2018-09-07 02:18:54 +00:00
|
|
|
return nil
|
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
|
2020-08-25 17:34:49 +00:00
|
|
|
// renewToken uses a vaultapi.Renewer to repeatedly renew our token's lease.
|
2020-10-09 12:02:18 +00:00
|
|
|
func (v *VaultProvider) renewToken(ctx context.Context, watcher *vaultapi.LifetimeWatcher) {
|
|
|
|
go watcher.Start()
|
|
|
|
defer watcher.Stop()
|
2020-08-25 17:34:49 +00:00
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
2020-09-11 15:41:05 +00:00
|
|
|
case <-ctx.Done():
|
2020-08-25 17:34:49 +00:00
|
|
|
return
|
|
|
|
|
2020-10-09 12:02:18 +00:00
|
|
|
case err := <-watcher.DoneCh():
|
2020-08-25 17:34:49 +00:00
|
|
|
if err != nil {
|
2020-09-15 19:28:58 +00:00
|
|
|
v.logger.Error("Error renewing token for Vault provider", "error", err)
|
2020-08-25 17:34:49 +00:00
|
|
|
}
|
|
|
|
|
2020-10-09 12:02:18 +00:00
|
|
|
// Watcher routine has finished, so start it again.
|
|
|
|
go watcher.Start()
|
2020-09-11 15:41:05 +00:00
|
|
|
|
2020-10-09 12:02:18 +00:00
|
|
|
case <-watcher.RenewCh():
|
2020-11-12 01:05:04 +00:00
|
|
|
v.logger.Info("Successfully renewed token for Vault provider")
|
2020-08-25 17:34:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetLogger implements the NeedsLogger interface so the provider can log important messages.
|
|
|
|
func (v *VaultProvider) SetLogger(logger hclog.Logger) {
|
|
|
|
v.logger = logger.
|
|
|
|
ResetNamed(logging.Connect).
|
|
|
|
Named(logging.CA).
|
|
|
|
Named(logging.Vault)
|
|
|
|
}
|
|
|
|
|
2019-11-11 20:57:16 +00:00
|
|
|
// State implements Provider. Vault provider needs no state other than the
|
|
|
|
// user-provided config currently.
|
|
|
|
func (v *VaultProvider) State() (map[string]string, error) {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
2018-09-11 23:43:04 +00:00
|
|
|
// ActiveRoot returns the active root CA certificate.
|
|
|
|
func (v *VaultProvider) ActiveRoot() (string, error) {
|
|
|
|
return v.getCA(v.config.RootPKIPath)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GenerateRoot mounts and initializes a new root PKI backend if needed.
|
2018-09-07 02:18:54 +00:00
|
|
|
func (v *VaultProvider) GenerateRoot() error {
|
2019-11-18 14:22:19 +00:00
|
|
|
if !v.isPrimary {
|
2018-09-07 02:18:54 +00:00
|
|
|
return fmt.Errorf("provider is not the root certificate authority")
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set up the root PKI backend if necessary.
|
2018-09-07 02:18:54 +00:00
|
|
|
_, err := v.ActiveRoot()
|
2018-06-13 08:40:03 +00:00
|
|
|
switch err {
|
|
|
|
case ErrBackendNotMounted:
|
2018-09-07 02:18:54 +00:00
|
|
|
err := v.client.Sys().Mount(v.config.RootPKIPath, &vaultapi.MountInput{
|
2018-06-13 08:40:03 +00:00
|
|
|
Type: "pki",
|
|
|
|
Description: "root CA backend for Consul Connect",
|
|
|
|
Config: vaultapi.MountConfigInput{
|
|
|
|
MaxLeaseTTL: "8760h",
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
if err != nil {
|
2018-09-07 02:18:54 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fallthrough
|
|
|
|
case ErrBackendNotInitialized:
|
2019-11-11 17:11:54 +00:00
|
|
|
uid, err := connect.CompactUID()
|
2019-08-27 21:45:58 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2018-09-07 02:18:54 +00:00
|
|
|
_, err = v.client.Logical().Write(v.config.RootPKIPath+"root/generate/internal", map[string]interface{}{
|
2019-11-18 14:22:19 +00:00
|
|
|
"common_name": connect.CACN("vault", uid, v.clusterID, v.isPrimary),
|
2019-09-23 17:04:40 +00:00
|
|
|
"uri_sans": v.spiffeID.URI().String(),
|
2019-07-30 21:47:39 +00:00
|
|
|
"key_type": v.config.PrivateKeyType,
|
|
|
|
"key_bits": v.config.PrivateKeyBits,
|
2018-06-13 08:40:03 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
2018-09-07 02:18:54 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
default:
|
|
|
|
if err != nil {
|
2018-09-07 02:18:54 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-07 02:18:54 +00:00
|
|
|
return nil
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2018-09-13 20:09:07 +00:00
|
|
|
// GenerateIntermediateCSR creates a private key and generates a CSR
|
|
|
|
// for another datacenter's root to sign, overwriting the intermediate backend
|
|
|
|
// in the process.
|
2018-09-13 02:52:24 +00:00
|
|
|
func (v *VaultProvider) GenerateIntermediateCSR() (string, error) {
|
2019-11-18 14:22:19 +00:00
|
|
|
if v.isPrimary {
|
2018-09-13 20:09:07 +00:00
|
|
|
return "", fmt.Errorf("provider is the root certificate authority, " +
|
|
|
|
"cannot generate an intermediate CSR")
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2018-09-13 20:09:07 +00:00
|
|
|
return v.generateIntermediateCSR()
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2020-06-05 19:36:22 +00:00
|
|
|
func (v *VaultProvider) setupIntermediatePKIPath() error {
|
|
|
|
if v.setupIntermediatePKIPathDone {
|
|
|
|
return nil
|
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
mounts, err := v.client.Sys().ListMounts()
|
|
|
|
if err != nil {
|
2020-06-05 19:36:22 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Mount the backend if it isn't mounted already.
|
|
|
|
if _, ok := mounts[v.config.IntermediatePKIPath]; !ok {
|
|
|
|
err := v.client.Sys().Mount(v.config.IntermediatePKIPath, &vaultapi.MountInput{
|
|
|
|
Type: "pki",
|
|
|
|
Description: "intermediate CA backend for Consul Connect",
|
|
|
|
Config: vaultapi.MountConfigInput{
|
2020-09-10 06:04:56 +00:00
|
|
|
MaxLeaseTTL: v.config.IntermediateCertTTL.String(),
|
2018-06-13 08:40:03 +00:00
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
if err != nil {
|
2020-06-05 19:36:22 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create the role for issuing leaf certs if it doesn't exist yet
|
|
|
|
rolePath := v.config.IntermediatePKIPath + "roles/" + VaultCALeafCertRole
|
|
|
|
role, err := v.client.Logical().Read(rolePath)
|
|
|
|
if err != nil {
|
2020-06-05 19:36:22 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
if role == nil {
|
|
|
|
_, err := v.client.Logical().Write(rolePath, map[string]interface{}{
|
2019-08-27 21:45:58 +00:00
|
|
|
"allow_any_name": true,
|
|
|
|
"allowed_uri_sans": "spiffe://*",
|
|
|
|
"key_type": "any",
|
|
|
|
"max_ttl": v.config.LeafCertTTL.String(),
|
|
|
|
"no_store": true,
|
|
|
|
"require_cn": false,
|
2018-06-13 08:40:03 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
2020-06-05 19:36:22 +00:00
|
|
|
return err
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
}
|
2020-06-05 19:36:22 +00:00
|
|
|
v.setupIntermediatePKIPathDone = true
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (v *VaultProvider) generateIntermediateCSR() (string, error) {
|
|
|
|
err := v.setupIntermediatePKIPath()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
|
|
|
|
// Generate a new intermediate CSR for the root to sign.
|
2019-11-11 17:11:54 +00:00
|
|
|
uid, err := connect.CompactUID()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2018-09-13 20:09:07 +00:00
|
|
|
data, err := v.client.Logical().Write(v.config.IntermediatePKIPath+"intermediate/generate/internal", map[string]interface{}{
|
2019-11-18 14:22:19 +00:00
|
|
|
"common_name": connect.CACN("vault", uid, v.clusterID, v.isPrimary),
|
2019-07-30 21:47:39 +00:00
|
|
|
"key_type": v.config.PrivateKeyType,
|
|
|
|
"key_bits": v.config.PrivateKeyBits,
|
2019-09-23 17:04:40 +00:00
|
|
|
"uri_sans": v.spiffeID.URI().String(),
|
2018-06-13 08:40:03 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2018-09-13 20:09:07 +00:00
|
|
|
if data == nil || data.Data["csr"] == "" {
|
2018-06-13 08:40:03 +00:00
|
|
|
return "", fmt.Errorf("got empty value when generating intermediate CSR")
|
|
|
|
}
|
2018-09-13 20:09:07 +00:00
|
|
|
csr, ok := data.Data["csr"].(string)
|
|
|
|
if !ok {
|
|
|
|
return "", fmt.Errorf("csr result is not a string")
|
|
|
|
}
|
|
|
|
|
|
|
|
return csr, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetIntermediate writes the incoming intermediate and root certificates to the
|
|
|
|
// intermediate backend (as a chain).
|
|
|
|
func (v *VaultProvider) SetIntermediate(intermediatePEM, rootPEM string) error {
|
2019-11-18 14:22:19 +00:00
|
|
|
if v.isPrimary {
|
2018-09-13 20:09:07 +00:00
|
|
|
return fmt.Errorf("cannot set an intermediate using another root in the primary datacenter")
|
|
|
|
}
|
|
|
|
|
2019-09-23 17:04:40 +00:00
|
|
|
err := validateSetIntermediate(
|
|
|
|
intermediatePEM, rootPEM,
|
|
|
|
"", // we don't have access to the private key directly
|
|
|
|
v.spiffeID,
|
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = v.client.Logical().Write(v.config.IntermediatePKIPath+"intermediate/set-signed", map[string]interface{}{
|
2018-09-13 20:09:07 +00:00
|
|
|
"certificate": fmt.Sprintf("%s\n%s", intermediatePEM, rootPEM),
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ActiveIntermediate returns the current intermediate certificate.
|
|
|
|
func (v *VaultProvider) ActiveIntermediate() (string, error) {
|
2020-06-05 19:36:22 +00:00
|
|
|
if err := v.setupIntermediatePKIPath(); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
cert, err := v.getCA(v.config.IntermediatePKIPath)
|
|
|
|
|
|
|
|
// This error is expected when calling initializeSecondaryCA for the
|
|
|
|
// first time. It means that the backend is mounted and ready, but
|
|
|
|
// there is no intermediate.
|
|
|
|
// This error is swallowed because there is nothing the caller can do
|
|
|
|
// about it. The caller needs to handle the empty cert though and
|
|
|
|
// create an intermediate CA.
|
|
|
|
if err == ErrBackendNotInitialized {
|
|
|
|
return "", nil
|
|
|
|
}
|
|
|
|
return cert, err
|
2018-09-13 20:09:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// getCA returns the raw CA cert for the given endpoint if there is one.
|
|
|
|
// We have to use the raw NewRequest call here instead of Logical().Read
|
|
|
|
// because the endpoint only returns the raw PEM contents of the CA cert
|
|
|
|
// and not the typical format of the secrets endpoints.
|
|
|
|
func (v *VaultProvider) getCA(path string) (string, error) {
|
|
|
|
req := v.client.NewRequest("GET", "/v1/"+path+"/ca/pem")
|
|
|
|
resp, err := v.client.RawRequest(req)
|
|
|
|
if resp != nil {
|
|
|
|
defer resp.Body.Close()
|
|
|
|
}
|
|
|
|
if resp != nil && resp.StatusCode == http.StatusNotFound {
|
|
|
|
return "", ErrBackendNotMounted
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
bytes, err := ioutil.ReadAll(resp.Body)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
2021-07-01 00:48:29 +00:00
|
|
|
root := EnsureTrailingNewline(string(bytes))
|
2018-09-13 20:09:07 +00:00
|
|
|
if root == "" {
|
|
|
|
return "", ErrBackendNotInitialized
|
|
|
|
}
|
|
|
|
|
|
|
|
return root, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GenerateIntermediate mounts the configured intermediate PKI backend if
|
|
|
|
// necessary, then generates and signs a new CA CSR using the root PKI backend
|
|
|
|
// and updates the intermediate backend to use that new certificate.
|
|
|
|
func (v *VaultProvider) GenerateIntermediate() (string, error) {
|
|
|
|
csr, err := v.generateIntermediateCSR()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
|
|
|
|
// Sign the CSR with the root backend.
|
|
|
|
intermediate, err := v.client.Logical().Write(v.config.RootPKIPath+"root/sign-intermediate", map[string]interface{}{
|
2019-09-23 17:04:40 +00:00
|
|
|
"csr": csr,
|
|
|
|
"use_csr_values": true,
|
|
|
|
"format": "pem_bundle",
|
2020-09-30 19:31:21 +00:00
|
|
|
"ttl": v.config.IntermediateCertTTL.String(),
|
2018-06-13 08:40:03 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2018-06-15 23:25:53 +00:00
|
|
|
if intermediate == nil || intermediate.Data["certificate"] == "" {
|
2018-06-13 08:40:03 +00:00
|
|
|
return "", fmt.Errorf("got empty value when generating intermediate certificate")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the intermediate backend to use the new certificate.
|
|
|
|
_, err = v.client.Logical().Write(v.config.IntermediatePKIPath+"intermediate/set-signed", map[string]interface{}{
|
|
|
|
"certificate": intermediate.Data["certificate"],
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
return v.ActiveIntermediate()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sign calls the configured role in the intermediate PKI backend to issue
|
|
|
|
// a new leaf certificate based on the provided CSR, with the issuing
|
|
|
|
// intermediate CA cert attached.
|
|
|
|
func (v *VaultProvider) Sign(csr *x509.CertificateRequest) (string, error) {
|
2021-06-25 18:00:00 +00:00
|
|
|
connect.HackSANExtensionForCSR(csr)
|
|
|
|
|
2018-06-13 08:40:03 +00:00
|
|
|
var pemBuf bytes.Buffer
|
|
|
|
if err := pem.Encode(&pemBuf, &pem.Block{Type: "CERTIFICATE REQUEST", Bytes: csr.Raw}); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Use the leaf cert role to sign a new cert for this CSR.
|
|
|
|
response, err := v.client.Logical().Write(v.config.IntermediatePKIPath+"sign/"+VaultCALeafCertRole, map[string]interface{}{
|
2018-06-14 21:20:10 +00:00
|
|
|
"csr": pemBuf.String(),
|
2018-07-26 00:51:45 +00:00
|
|
|
"ttl": v.config.LeafCertTTL.String(),
|
2018-06-13 08:40:03 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
2018-06-14 21:20:10 +00:00
|
|
|
return "", fmt.Errorf("error issuing cert: %v", err)
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
if response == nil || response.Data["certificate"] == "" || response.Data["issuing_ca"] == "" {
|
|
|
|
return "", fmt.Errorf("certificate info returned from Vault was blank")
|
|
|
|
}
|
|
|
|
|
|
|
|
cert, ok := response.Data["certificate"].(string)
|
|
|
|
if !ok {
|
|
|
|
return "", fmt.Errorf("certificate was not a string")
|
|
|
|
}
|
|
|
|
ca, ok := response.Data["issuing_ca"].(string)
|
|
|
|
if !ok {
|
|
|
|
return "", fmt.Errorf("issuing_ca was not a string")
|
|
|
|
}
|
|
|
|
|
2021-07-01 00:48:29 +00:00
|
|
|
return EnsureTrailingNewline(cert) + EnsureTrailingNewline(ca), nil
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2018-09-13 20:09:07 +00:00
|
|
|
// SignIntermediate returns a signed CA certificate with a path length constraint
|
|
|
|
// of 0 to ensure that the certificate cannot be used to generate further CA certs.
|
|
|
|
func (v *VaultProvider) SignIntermediate(csr *x509.CertificateRequest) (string, error) {
|
2019-11-21 17:40:29 +00:00
|
|
|
err := validateSignIntermediate(csr, v.spiffeID)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
2018-09-13 20:09:07 +00:00
|
|
|
var pemBuf bytes.Buffer
|
2019-11-21 17:40:29 +00:00
|
|
|
err = pem.Encode(&pemBuf, &pem.Block{Type: "CERTIFICATE REQUEST", Bytes: csr.Raw})
|
2018-09-13 20:09:07 +00:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sign the CSR with the root backend.
|
|
|
|
data, err := v.client.Logical().Write(v.config.RootPKIPath+"root/sign-intermediate", map[string]interface{}{
|
|
|
|
"csr": pemBuf.String(),
|
2019-09-23 17:04:40 +00:00
|
|
|
"use_csr_values": true,
|
2018-09-13 20:09:07 +00:00
|
|
|
"format": "pem_bundle",
|
|
|
|
"max_path_length": 0,
|
2020-09-30 19:31:21 +00:00
|
|
|
"ttl": v.config.IntermediateCertTTL.String(),
|
2018-09-13 20:09:07 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
if data == nil || data.Data["certificate"] == "" {
|
|
|
|
return "", fmt.Errorf("got empty value when generating intermediate certificate")
|
|
|
|
}
|
|
|
|
|
|
|
|
intermediate, ok := data.Data["certificate"].(string)
|
|
|
|
if !ok {
|
|
|
|
return "", fmt.Errorf("signed intermediate result is not a string")
|
|
|
|
}
|
|
|
|
|
2021-07-01 00:48:29 +00:00
|
|
|
return EnsureTrailingNewline(intermediate), nil
|
2018-09-13 02:52:24 +00:00
|
|
|
}
|
|
|
|
|
2018-06-19 23:46:18 +00:00
|
|
|
// CrossSignCA takes a CA certificate and cross-signs it to form a trust chain
|
|
|
|
// back to our active root.
|
|
|
|
func (v *VaultProvider) CrossSignCA(cert *x509.Certificate) (string, error) {
|
2020-10-09 11:35:42 +00:00
|
|
|
rootPEM, err := v.ActiveRoot()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
rootCert, err := connect.ParseCert(rootPEM)
|
|
|
|
if err != nil {
|
|
|
|
return "", fmt.Errorf("error parsing root cert: %v", err)
|
|
|
|
}
|
|
|
|
if rootCert.NotAfter.Before(time.Now()) {
|
|
|
|
return "", fmt.Errorf("root certificate is expired")
|
|
|
|
}
|
|
|
|
|
2018-06-19 23:46:18 +00:00
|
|
|
var pemBuf bytes.Buffer
|
2020-10-09 11:35:42 +00:00
|
|
|
err = pem.Encode(&pemBuf, &pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw})
|
2018-06-15 23:25:53 +00:00
|
|
|
if err != nil {
|
2018-06-13 08:40:03 +00:00
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
2018-06-19 23:46:18 +00:00
|
|
|
// Have the root PKI backend sign this cert.
|
|
|
|
response, err := v.client.Logical().Write(v.config.RootPKIPath+"root/sign-self-issued", map[string]interface{}{
|
|
|
|
"certificate": pemBuf.String(),
|
2018-06-15 23:25:53 +00:00
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return "", fmt.Errorf("error having Vault cross-sign cert: %v", err)
|
|
|
|
}
|
|
|
|
if response == nil || response.Data["certificate"] == "" {
|
|
|
|
return "", fmt.Errorf("certificate info returned from Vault was blank")
|
|
|
|
}
|
|
|
|
|
|
|
|
xcCert, ok := response.Data["certificate"].(string)
|
|
|
|
if !ok {
|
|
|
|
return "", fmt.Errorf("certificate was not a string")
|
|
|
|
}
|
|
|
|
|
2021-07-01 00:48:29 +00:00
|
|
|
return EnsureTrailingNewline(xcCert), nil
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2019-11-11 21:36:22 +00:00
|
|
|
// SupportsCrossSigning implements Provider
|
2021-06-23 19:47:30 +00:00
|
|
|
func (v *VaultProvider) SupportsCrossSigning() (bool, error) {
|
2019-11-11 21:36:22 +00:00
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
2018-06-13 08:40:03 +00:00
|
|
|
// Cleanup unmounts the configured intermediate PKI backend. It's fine to tear
|
|
|
|
// this down and recreate it on small config changes because the intermediate
|
|
|
|
// certs get bundled with the leaf certs, so there's no cost to the CA changing.
|
2021-01-15 18:20:27 +00:00
|
|
|
func (v *VaultProvider) Cleanup(providerTypeChange bool, otherConfig map[string]interface{}) error {
|
2020-09-10 13:12:48 +00:00
|
|
|
v.Stop()
|
2020-08-25 17:34:49 +00:00
|
|
|
|
2021-01-15 18:20:27 +00:00
|
|
|
if !providerTypeChange {
|
|
|
|
newConfig, err := ParseVaultCAConfig(otherConfig)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// if the intermeidate PKI path isn't changing we don't want to delete it as
|
|
|
|
// Cleanup is called after initializing the new provider
|
|
|
|
if newConfig.IntermediatePKIPath == v.config.IntermediatePKIPath {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err := v.client.Sys().Unmount(v.config.IntermediatePKIPath)
|
|
|
|
|
|
|
|
switch err {
|
|
|
|
case ErrBackendNotMounted, ErrBackendNotInitialized:
|
|
|
|
// suppress these errors if we didn't finish initialization before
|
|
|
|
return nil
|
|
|
|
default:
|
|
|
|
return err
|
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
}
|
|
|
|
|
2020-09-10 13:12:48 +00:00
|
|
|
// Stop shuts down the token renew goroutine.
|
|
|
|
func (v *VaultProvider) Stop() {
|
2020-09-11 15:41:05 +00:00
|
|
|
v.shutdown()
|
2020-09-10 13:12:48 +00:00
|
|
|
}
|
|
|
|
|
2021-06-23 19:47:30 +00:00
|
|
|
func (v *VaultProvider) PrimaryUsesIntermediate() {}
|
|
|
|
|
2018-06-13 08:40:03 +00:00
|
|
|
func ParseVaultCAConfig(raw map[string]interface{}) (*structs.VaultCAProviderConfig, error) {
|
2018-07-16 09:46:10 +00:00
|
|
|
config := structs.VaultCAProviderConfig{
|
|
|
|
CommonCAProviderConfig: defaultCommonConfig(),
|
|
|
|
}
|
2018-06-13 08:40:03 +00:00
|
|
|
|
2018-06-20 21:33:02 +00:00
|
|
|
decodeConf := &mapstructure.DecoderConfig{
|
2018-09-13 14:43:00 +00:00
|
|
|
DecodeHook: structs.ParseDurationFunc(),
|
2018-06-20 21:33:02 +00:00
|
|
|
Result: &config,
|
|
|
|
WeaklyTypedInput: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder, err := mapstructure.NewDecoder(decodeConf)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := decoder.Decode(raw); err != nil {
|
2018-06-13 08:40:03 +00:00
|
|
|
return nil, fmt.Errorf("error decoding config: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.Token == "" {
|
|
|
|
return nil, fmt.Errorf("must provide a Vault token")
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.RootPKIPath == "" {
|
|
|
|
return nil, fmt.Errorf("must provide a valid path to a root PKI backend")
|
|
|
|
}
|
|
|
|
if !strings.HasSuffix(config.RootPKIPath, "/") {
|
|
|
|
config.RootPKIPath += "/"
|
|
|
|
}
|
|
|
|
|
|
|
|
if config.IntermediatePKIPath == "" {
|
|
|
|
return nil, fmt.Errorf("must provide a valid path for the intermediate PKI backend")
|
|
|
|
}
|
|
|
|
if !strings.HasSuffix(config.IntermediatePKIPath, "/") {
|
|
|
|
config.IntermediatePKIPath += "/"
|
|
|
|
}
|
|
|
|
|
2018-07-20 23:04:04 +00:00
|
|
|
if err := config.CommonCAProviderConfig.Validate(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2018-06-13 08:40:03 +00:00
|
|
|
return &config, nil
|
|
|
|
}
|