mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Progress.

Browse source
This commit is contained in:
Carl Tashian 2022-03-30 16:05:26 -07:00
parent 055e75f394
commit 90cb6315b1
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
authority/authority.go
View file

@ -83,8 +83,8 @@ type Authority struct {
type AuthorityInfo struct {
StartTime time.Time
RootX509Certs []*x509.Certificate
SSHCAUserCerts []ssh.PublicKey
SSHCAHostCerts []ssh.PublicKey
SSHCAUserPublicKey []byte
SSHCAHostPublicKey []byte
}
@ -568,13 +568,17 @@ func (a *Authority) GetAdminDatabase() admin.DB {
}
func (a *Authority) GetAuthorityInfo() *AuthorityInfo {
return &AuthorityInfo{
ai := &AuthorityInfo{
StartTime: a.startTime,
RootX509Certs: a.rootX509Certs,
SSHCAUserCerts: a.sshCAUserCerts,
SSHCAHostCerts: a.sshCAHostCerts,
}
if a.sshCAUserCertSignKey != nil {
ai.SSHCAUserPublicKey = ssh.MarshalAuthorizedKey(a.sshCAUserCertSignKey.PublicKey())
}
if a.sshCAHostCertSignKey != nil {
ai.SSHCAHostPublicKey = ssh.MarshalAuthorizedKey(a.sshCAHostCertSignKey.PublicKey())
}
return ai
}
// IsAdminAPIEnabled returns a boolean indicating whether the Admin API has

8
ca/ca.go
View file

@ -305,11 +305,11 @@ func (ca *CA) Run() error {
sum := sha256.Sum256(crt.Raw)
log.Printf("X.509 Root Fingerprint: %s", hex.EncodeToString(sum[:]))
}
if ca.config.SSH != nil {
log.Printf("SSH Host CA Key: %s\n", ca.config.SSH.HostKey)
if authorityInfo.SSHCAHostPublicKey != nil {
log.Printf("SSH Host CA Key: %s\n", authorityInfo.SSHCAHostPublicKey)
}
if ca.config.SSH != nil {
log.Printf("SSH User CA Key: %s\n", ca.config.SSH.UserKey)
if authorityInfo.SSHCAUserPublicKey != nil {
log.Printf("SSH User CA Key: %s\n", authorityInfo.SSHCAUserPublicKey)
}
log.Printf("Documentation: https://u.step.sm/docs/ca")
log.Printf("Community Discord: https://u.step.sm/discord")