-
Notifications
You must be signed in to change notification settings - Fork 524
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: reimplement apid certificate generation on top of COSI
This PR can be split into two parts: * controllers * apid binding into COSI world Controllers ----------- * `k8s.EndpointController` provides control plane endpoints on worker nodes (it isn't required for now on control plane nodes) * `secrets.RootController` now provides OS top-level secrets (CA cert) and secret configuration * `secrets.APIController` generates API secrets (certificates) in a bit different way for workers and control plane nodes: controlplane nodes generate directly, while workers reach out to `trustd` on control plane nodes via `k8s.Endpoint` resource apid Binding ------------ Resource `secrets.API` provides binding to protobuf by converting itself back and forth to protobuf spec. apid no longer receives machine configuration, instead it receives gRPC-backed socket to access Resource API. apid watches `secrets.API` resource, fetches certs and CA from it and uses that in its TLS configuration. Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
- Loading branch information
Showing
30 changed files
with
1,442 additions
and
362 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package resource.secrets; | ||
|
|
||
| option go_package = "github.com/talos-systems/talos/pkg/machinery/api/resource/secrets"; | ||
|
|
||
| message CertAndKeyPEM { | ||
| bytes cert = 1; | ||
| bytes key = 2; | ||
| } | ||
|
|
||
| // APISpec describes secrets.API. | ||
| message APISpec { | ||
| bytes ca_pem = 1; | ||
| CertAndKeyPEM server = 2; | ||
| CertAndKeyPEM client = 3; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| // Package provider provides TLS config for client & server. | ||
| package provider | ||
|
|
||
| import ( | ||
| "context" | ||
| stdlibtls "crypto/tls" | ||
| "fmt" | ||
| "log" | ||
| "sync" | ||
|
|
||
| "github.com/cosi-project/runtime/pkg/resource" | ||
| "github.com/cosi-project/runtime/pkg/state" | ||
| "github.com/talos-systems/crypto/tls" | ||
|
|
||
| "github.com/talos-systems/talos/pkg/resources/secrets" | ||
| ) | ||
|
|
||
| // TLSConfig provides client & server TLS configs for apid. | ||
| type TLSConfig struct { | ||
| certificateProvider *certificateProvider | ||
| } | ||
|
|
||
| // NewTLSConfig builds provider from configuration and endpoints. | ||
| func NewTLSConfig(resources state.State) (*TLSConfig, error) { | ||
| watchCh := make(chan state.Event) | ||
|
|
||
| if err := resources.Watch(context.TODO(), resource.NewMetadata(secrets.NamespaceName, secrets.APIType, secrets.APIID, resource.VersionUndefined), watchCh); err != nil { | ||
| return nil, fmt.Errorf("error setting up watch: %w", err) | ||
| } | ||
|
|
||
| // wait for the first event to set up certificate provider | ||
| provider := &certificateProvider{} | ||
|
|
||
| for { | ||
| event := <-watchCh | ||
| if event.Type == state.Destroyed { | ||
| continue | ||
| } | ||
|
|
||
| apiCerts := event.Resource.(*secrets.API) //nolint:errcheck,forcetypeassert | ||
|
|
||
| if err := provider.Update(apiCerts); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| break | ||
| } | ||
|
|
||
| go func() { | ||
| for { | ||
| event := <-watchCh | ||
| if event.Type == state.Destroyed { | ||
| continue | ||
| } | ||
|
|
||
| apiCerts := event.Resource.(*secrets.API) //nolint:errcheck,forcetypeassert | ||
|
|
||
| if err := provider.Update(apiCerts); err != nil { | ||
| log.Printf("failed updating cert: %v", err) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| return &TLSConfig{ | ||
| certificateProvider: provider, | ||
| }, nil | ||
| } | ||
|
|
||
| // ServerConfig generates server-side tls.Config. | ||
| func (tlsConfig *TLSConfig) ServerConfig() (*stdlibtls.Config, error) { | ||
| ca, err := tlsConfig.certificateProvider.GetCA() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get root CA: %w", err) | ||
| } | ||
|
|
||
| return tls.New( | ||
| tls.WithClientAuthType(tls.Mutual), | ||
| tls.WithCACertPEM(ca), | ||
| tls.WithServerCertificateProvider(tlsConfig.certificateProvider), | ||
| ) | ||
| } | ||
|
|
||
| // ClientConfig generates client-side tls.Config. | ||
| func (tlsConfig *TLSConfig) ClientConfig() (*stdlibtls.Config, error) { | ||
| ca, err := tlsConfig.certificateProvider.GetCA() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get root CA: %w", err) | ||
| } | ||
|
|
||
| return tls.New( | ||
| tls.WithClientAuthType(tls.Mutual), | ||
| tls.WithCACertPEM(ca), | ||
| tls.WithClientCertificateProvider(tlsConfig.certificateProvider), | ||
| ) | ||
| } | ||
|
|
||
| type certificateProvider struct { | ||
| mu sync.Mutex | ||
|
|
||
| apiCerts *secrets.API | ||
| clientCert, serverCert *stdlibtls.Certificate | ||
| } | ||
|
|
||
| func (p *certificateProvider) Update(apiCerts *secrets.API) error { | ||
| p.mu.Lock() | ||
| defer p.mu.Unlock() | ||
|
|
||
| p.apiCerts = apiCerts | ||
|
|
||
| serverCert, err := stdlibtls.X509KeyPair(p.apiCerts.TypedSpec().Server.Crt, p.apiCerts.TypedSpec().Server.Key) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to parse server cert and key into a TLS Certificate: %w", err) | ||
| } | ||
|
|
||
| p.serverCert = &serverCert | ||
|
|
||
| clientCert, err := stdlibtls.X509KeyPair(p.apiCerts.TypedSpec().Client.Crt, p.apiCerts.TypedSpec().Client.Key) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to parse client cert and key into a TLS Certificate: %w", err) | ||
| } | ||
|
|
||
| p.clientCert = &clientCert | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (p *certificateProvider) GetCA() ([]byte, error) { | ||
| p.mu.Lock() | ||
| defer p.mu.Unlock() | ||
|
|
||
| return p.apiCerts.TypedSpec().CA.Crt, nil | ||
| } | ||
|
|
||
| func (p *certificateProvider) GetCertificate(h *stdlibtls.ClientHelloInfo) (*stdlibtls.Certificate, error) { | ||
| p.mu.Lock() | ||
| defer p.mu.Unlock() | ||
|
|
||
| return p.serverCert, nil | ||
| } | ||
|
|
||
| func (p *certificateProvider) GetClientCertificate(*stdlibtls.CertificateRequestInfo) (*stdlibtls.Certificate, error) { | ||
| p.mu.Lock() | ||
| defer p.mu.Unlock() | ||
|
|
||
| return p.clientCert, nil | ||
| } |
Oops, something went wrong.