mirror of
https://github.com/status-im/consul.git
synced 2025-01-10 13:55:55 +00:00
5e9f02d4be
* Define file-system-certificate config entry * Collect file-system-certificate(s) referenced by api-gateway onto snapshot * Add file-system-certificate to config entry kind allow lists * Remove inapplicable validation This validation makes sense for inline certificates since Consul server is holding the certificate; however, for file system certificates, Consul server never actually sees the certificate. * Support file-system-certificate as source for listener TLS certificate * Add more required mappings for the new config entry type * Construct proper TLS context based on certificate kind * Add support or SDS in xdscommon * Remove unused param * Adds back verification of certs for inline-certificates * Undo tangential changes to TLS config consumption * Remove stray curly braces * Undo some more tangential changes * Improve function name for generating API gateway secrets * Add changelog entry * Update .changelog/20873.txt Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com> * Add some nil-checking, remove outdated TODO * Update test assertions to include file-system-certificate * Add documentation for file-system-certificate config entry Add new doc to nav * Fix grammar mistake * Rename watchmaps, remove outdated TODO --------- Co-authored-by: Melisa Griffin <melisa.griffin@hashicorp.com> Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
68 lines
2.0 KiB
Go
68 lines
2.0 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package xds
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
|
|
envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
|
|
envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/hashicorp/consul/agent/proxycfg"
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
// secretsFromSnapshot returns the xDS API representation of the "secrets"
|
|
// in the snapshot
|
|
func (s *ResourceGenerator) secretsFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
|
|
if cfgSnap == nil {
|
|
return nil, errors.New("nil config given")
|
|
}
|
|
|
|
switch cfgSnap.Kind {
|
|
case structs.ServiceKindAPIGateway:
|
|
return s.secretsFromSnapshotAPIGateway(cfgSnap), nil // return any attached certs
|
|
case structs.ServiceKindConnectProxy,
|
|
structs.ServiceKindTerminatingGateway,
|
|
structs.ServiceKindMeshGateway,
|
|
structs.ServiceKindIngressGateway:
|
|
return nil, nil
|
|
default:
|
|
return nil, fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind)
|
|
}
|
|
}
|
|
|
|
// secretsFromSnapshotAPIGateway returns the "secrets" for an api-gateway service
|
|
func (s *ResourceGenerator) secretsFromSnapshotAPIGateway(cfgSnap *proxycfg.ConfigSnapshot) []proto.Message {
|
|
var resources []proto.Message
|
|
|
|
cfgSnap.APIGateway.FileSystemCertificates.ForEachKey(func(ref structs.ResourceReference) bool {
|
|
cert, ok := cfgSnap.APIGateway.FileSystemCertificates.Get(ref)
|
|
if !ok || cert == nil {
|
|
return true
|
|
}
|
|
resources = append(resources, &envoy_tls_v3.Secret{
|
|
Name: ref.Name,
|
|
Type: &envoy_tls_v3.Secret_TlsCertificate{
|
|
TlsCertificate: &envoy_tls_v3.TlsCertificate{
|
|
CertificateChain: &envoy_core_v3.DataSource{
|
|
Specifier: &envoy_core_v3.DataSource_Filename{
|
|
Filename: cert.Certificate,
|
|
}},
|
|
PrivateKey: &envoy_core_v3.DataSource{
|
|
Specifier: &envoy_core_v3.DataSource_Filename{
|
|
Filename: cert.PrivateKey,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
return true
|
|
})
|
|
|
|
return resources
|
|
}
|