Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-15 02:05:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

adjusted key derivation logic to happen in the join client

Browse source
This commit is contained in:
miampf 2025-01-09 12:34:01 +01:00
parent 9363206662
commit 23b23d8ed4
No known key found for this signature in database
GPG key ID: EF039364B5B6886C
6 changed files with 26 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bootstrapper/internal/joinclient/joinclient.go
View file

@ -18,7 +18,9 @@ If the JoinClient finds an existing cluster, it will attempt to join it as eithe
package joinclient
import (
"bytes"
"context"
"crypto/ed25519"
"errors"
"fmt"
"log/slog"
@ -37,6 +39,7 @@ import (
"github.com/edgelesssys/constellation/v2/internal/versions/components"
"github.com/edgelesssys/constellation/v2/joinservice/joinproto"
"github.com/spf13/afero"
"golang.org/x/crypto/ssh"
"google.golang.org/grpc"
kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
kubeconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
@ -270,8 +273,19 @@ func (c *JoinClient) startNodeAndJoin(ticket *joinproto.IssueJoinTicketResponse,
if err := c.fileHandler.Write(certificate.KeyFilename, kubeletKey, file.OptMkdirAll); err != nil {
return fmt.Errorf("writing kubelet key: %w", err)
}
// derive CA key from emergency key
_, priv, err := ed25519.GenerateKey(bytes.NewReader(ticket.EmergencyCaKey))
if err != nil {
return fmt.Errorf("deriving ed25519 ssh emergency key: %w", err)
}
ca, err := ssh.NewSignerFromSigner(priv)
if err != nil {
return fmt.Errorf("creating emergency SSH CA key: %w", err)
}
// TODO(miampf): Make path a constant
if err := c.fileHandler.Write("/run/ssh/ssh_ca.pub", ticket.EmergencyCaKey, file.OptMkdirAll); err != nil {
if err := c.fileHandler.Write("/run/ssh/ssh_ca.pub", ssh.MarshalAuthorizedKey(ca.PublicKey()), file.OptMkdirAll); err != nil {
return fmt.Errorf("writing ca key: %w", err)
}