Skip to content

Remove cert validation check #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oschwartz10612 merged 2 commits into from
Jun 11, 2026
Merged

Remove cert validation check #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
404f1bf
Remove cert validation check
oschwartz10612 Jun 11, 2026
8872706
Merge branch 'main' into dev
oschwartz10612 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions cmd/ssh/jit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package ssh

import (
"bytes"
"fmt"
"strings"
"time"

"github.com/fosrl/cli/internal/api"
"github.com/fosrl/cli/internal/sshkeys"
"golang.org/x/crypto/ssh"
)

const (
Expand All @@ -17,34 +14,6 @@ const (
pollBackoffSteps = 6
)

func validateSignedCert(pubKey, cert string) error {
cert = strings.TrimSpace(cert)
if cert == "" {
return fmt.Errorf("API returned an empty SSH certificate")
}

pubParsed, _, _, _, err := ssh.ParseAuthorizedKey([]byte(pubKey))
if err != nil {
return fmt.Errorf("parse generated public key: %w", err)
}

certParsed, _, _, _, err := ssh.ParseAuthorizedKey([]byte(cert))
if err != nil {
return fmt.Errorf("parse returned certificate: %w", err)
}

certKey, ok := certParsed.(*ssh.Certificate)
if !ok {
return fmt.Errorf("API returned %q instead of an SSH certificate", certParsed.Type())
}

if !bytes.Equal(certKey.Key.Marshal(), pubParsed.Marshal()) {
return fmt.Errorf("returned certificate does not match generated key")
}

return nil
}

// GenerateAndSignKey generates an Ed25519 key pair and signs the public key via the API.
func GenerateAndSignKey(client *api.Client, orgID string, resourceID string, username string) (privPEM, pubKey, cert string, signData *api.SignSSHKeyData, err error) {
privPEM, pubKey, err = sshkeys.GenerateKeyPair()
Expand All @@ -68,11 +37,6 @@ func GenerateAndSignKey(client *api.Client, orgID string, resourceID string, use
} else if initResp.MessageID != 0 {
messageIDs = []int64{initResp.MessageID}
} else {
if initResp.AuthDaemonMode != "native" {
if err := validateSignedCert(pubKey, initResp.Certificate); err != nil {
return "", "", "", nil, fmt.Errorf("SSH error: invalid certificate: %w", err)
}
}
// return the data as this is okay
return privPEM, pubKey, initResp.Certificate, initResp, nil
}
Expand All @@ -90,11 +54,6 @@ func GenerateAndSignKey(client *api.Client, orgID string, resourceID string, use
if msg.Error != nil && *msg.Error != "" {
return "", "", "", nil, fmt.Errorf("SSH error: %s", *msg.Error)
}
if initResp.AuthDaemonMode != "native" {
if err := validateSignedCert(pubKey, initResp.Certificate); err != nil {
return "", "", "", nil, fmt.Errorf("SSH error: invalid certificate: %w", err)
}
}
return privPEM, pubKey, initResp.Certificate, initResp, nil
}
}
Expand Down
Loading