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

implement small changes

Browse source
This commit is contained in:
miampf 2025-01-16 16:20:03 +01:00
parent f386dbc95f
commit 21c9cd6a26
No known key found for this signature in database
GPG key ID: EF039364B5B6886C
7 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
joinservice/internal/server/server.go
View file

@ -103,14 +103,14 @@ func (s *Server) IssueJoinTicket(ctx context.Context, req *joinproto.IssueJoinTi
}
log.Info("Requesting emergency SSH CA derivation key")
ssheCADerivationKey, err := s.dataKeyGetter.GetDataKey(ctx, constants.SSHCAKeySuffix, ed25519.SeedSize)
sshCAKeySeed, err := s.dataKeyGetter.GetDataKey(ctx, constants.SSHCAKeySuffix, ed25519.SeedSize)
if err != nil {
log.With(slog.Any("error", err)).Error("Failed to get emergency SSH CA derivation key")
return nil, status.Errorf(codes.Internal, "getting emergency SSH CA derivation key: %s", err)
log.With(slog.Any("error", err)).Error("Failed to get seed material to derive SSH CA key")
return nil, status.Errorf(codes.Internal, "getting emergency SSH CA seed material: %s", err)
}
ca, err := crypto.GenerateEmergencySSHCAKey(ssheCADerivationKey)
ca, err := crypto.GenerateEmergencySSHCAKey(sshCAKeySeed)
if err != nil {
log.With(slog.Any("error", err)).Error("Failed to derive ssh CA key from derivation key")
log.With(slog.Any("error", err)).Error("Failed to derive ssh CA key from seed material")
return nil, status.Errorf(codes.Internal, "generating ssh emergency CA key: %s", err)
}
@ -181,7 +181,7 @@ func (s *Server) IssueJoinTicket(ctx context.Context, req *joinproto.IssueJoinTi
KubeletCert: kubeletCert,
ControlPlaneFiles: controlPlaneFiles,
KubernetesComponents: components,
EmergencyCaKey: ssh.MarshalAuthorizedKey(ca.PublicKey()),
AuthorizedCaPublicKey: ssh.MarshalAuthorizedKey(ca.PublicKey()),
}, nil
}