Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-14 17:55:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

refactoring

Browse source
This commit is contained in:
miampf 2025-01-09 16:01:03 +01:00
parent d336d06480
commit 241d0cd88d
No known key found for this signature in database
GPG key ID: EF039364B5B6886C
6 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,9 +18,7 @@ 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"
@ -33,6 +31,7 @@ import (
"github.com/edgelesssys/constellation/v2/internal/attestation"
"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
"github.com/edgelesssys/constellation/v2/internal/constants"
"github.com/edgelesssys/constellation/v2/internal/crypto"
"github.com/edgelesssys/constellation/v2/internal/file"
"github.com/edgelesssys/constellation/v2/internal/nodestate"
"github.com/edgelesssys/constellation/v2/internal/role"
@ -274,17 +273,11 @@ func (c *JoinClient) startNodeAndJoin(ticket *joinproto.IssueJoinTicketResponse,
return fmt.Errorf("writing kubelet key: %w", err)
}
// derive CA key from emergency key
_, priv, err := ed25519.GenerateKey(bytes.NewReader(ticket.EmergencyCaKey))
ca, err := crypto.GenerateEmergencySSHCAKey(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)
return fmt.Errorf("generating emergency SSH CA key: %s", err)
}
// TODO(miampf): Make path a constant
if err := c.fileHandler.Write(constants.SSHCAKeyPath, ssh.MarshalAuthorizedKey(ca.PublicKey()), file.OptMkdirAll); err != nil {
return fmt.Errorf("writing ca key: %w", err)
}