Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aeraki and envoy communicate through mTLS #401

Merged
merged 1 commit into from
Dec 19, 2023
Merged

aeraki and envoy communicate through mTLS #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions internal/bootstrap/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ import (
"bytes"
"context"
"crypto/tls"
"crypto/x509"
"errors"
"fmt"
"net"
"net/http"
"os"

//nolint
_ "net/http/pprof" // pprof
Expand Down Expand Up @@ -163,6 +165,9 @@ func NewServer(args *AerakiArgs) (*Server, error) {
if err := server.initRootCA(); err != nil {
return nil, fmt.Errorf("error initializing root ca: %v", err)
}
if err := server.initXdsServer(); err != nil {
return nil, fmt.Errorf("error initializing xds server: %v", err)
}
if err := server.initSecureWebhookServer(args); err != nil {
return nil, fmt.Errorf("error initializing webhook server: %v", err)
}
Expand All @@ -177,6 +182,25 @@ func NewServer(args *AerakiArgs) (*Server, error) {
return server, err
}

func (s *Server) initXdsServer() error {
pool := x509.NewCertPool()
istiodCACertPath := "/var/run/secrets/istio/root-cert.pem"
caCrt, err := os.ReadFile(istiodCACertPath)
if err != nil {
return fmt.Errorf("failed to read istio ca cert file: %v", err)
}
pool.AppendCertsFromPEM(caCrt)

s.xdsServer.TLSConfig = tls.Config{
GetCertificate: s.getAerakiCertificate,
MinVersion: tls.VersionTLS12,
ClientAuth: tls.RequireAndVerifyClientCert,
ClientCAs: pool,
}

return nil
}

func (s *Server) initAerakiServer(args *AerakiArgs) {
// make sure we have a readiness probe before serving HTTP to avoid marking ready too soon
s.initReadinessProbes()
Expand Down
42 changes: 42 additions & 0 deletions internal/controller/kube/sidecar_bootstrap_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,48 @@ var bootstrapConfig = `
]
}
]
},
"transport_socket": {
"name": "envoy.transport_sockets.tls",
"typed_config": {
"@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
"common_tls_context": {
"validation_context_sds_secret_config": {
"name": "ROOTCA",
"sds_config": {
"api_config_source": {
"api_type": "GRPC",
"grpc_services": [{
"envoy_grpc": {
"cluster_name": "sds-grpc"
}
}],
"set_node_on_first_message_only": true,
"transport_api_version": "V3"
},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3"
}
},
"tls_certificate_sds_secret_configs": [{
"name": "default",
"sds_config": {
"api_config_source": {
"api_type": "GRPC",
"grpc_services": [{
"envoy_grpc": {
"cluster_name": "sds-grpc"
}
}],
"set_node_on_first_message_only": true,
"transport_api_version": "V3"
},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3"
}
}]
}
}
}
}
]
Expand Down
10 changes: 8 additions & 2 deletions internal/xds/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ package xds

import (
"context"
"crypto/tls"
"net"

"google.golang.org/grpc/credentials"

routeservice "github.com/envoyproxy/go-control-plane/envoy/service/route/v3"
cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
serverv3 "github.com/envoyproxy/go-control-plane/pkg/server/v3"
Expand All @@ -39,8 +42,9 @@ type cacheMgr interface {

// Server serves xDS resources to Envoy sidecars
type Server struct {
addr string
cacheMgr cacheMgr
addr string
cacheMgr cacheMgr
TLSConfig tls.Config
}

// NewServer creates a xDS server
Expand All @@ -59,6 +63,8 @@ func (s *Server) Run(stopCh <-chan struct{}) {
// availability problems.
var grpcOptions []grpc.ServerOption
grpcOptions = append(grpcOptions, grpc.MaxConcurrentStreams(grpcMaxConcurrentStreams))
tlsCreds := credentials.NewTLS(&s.TLSConfig)
grpcOptions = append(grpcOptions, grpc.Creds(tlsCreds))
grpcServer := grpc.NewServer(grpcOptions...)

lis, err := net.Listen("tcp", s.addr)
Expand Down
42 changes: 42 additions & 0 deletions k8s/aeraki-bootstrap-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,48 @@ data:
]
}
]
},
"transport_socket": {
"name": "envoy.transport_sockets.tls",
"typed_config": {
"@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
"common_tls_context": {
"validation_context_sds_secret_config": {
"name": "ROOTCA",
"sds_config": {
"api_config_source": {
"api_type": "GRPC",
"grpc_services": [{
"envoy_grpc": {
"cluster_name": "sds-grpc"
}
}],
"set_node_on_first_message_only": true,
"transport_api_version": "V3"
},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3"
}
},
"tls_certificate_sds_secret_configs": [{
"name": "default",
"sds_config": {
"api_config_source": {
"api_type": "GRPC",
"grpc_services": [{
"envoy_grpc": {
"cluster_name": "sds-grpc"
}
}],
"set_node_on_first_message_only": true,
"transport_api_version": "V3"
},
"initial_fetch_timeout": "0s",
"resource_api_version": "V3"
}
}]
}
}
}
}
]
Expand Down
Loading