Skip to content

Redact private key material from SSH error messages #38543

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

Closed
SebTardif wants to merge 2 commits into from
Closed

Redact private key material from SSH error messages #38543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35bd57f
Redact private key material from SSH error messages
SebTardif May 8, 2026
2fafebe
Add changelog entry for SSH key redaction
SebTardif May 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
5 changes: 5 additions & 0 deletions .changes/v1.16/BUG FIXES-20260511-064314-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: BUG FIXES
body: 'communicator/ssh: Redact private key and certificate material from error messages to prevent credential exposure in logs'
time: 2026-05-11T06:26:00.000000Z
custom:
Issue: "38543"
8 changes: 4 additions & 4 deletions internal/communicator/ssh/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,22 +397,22 @@ func buildSSHClientConfig(opts sshClientConfigOpts) (*ssh.ClientConfig, error) {
func signCertWithPrivateKey(pk string, certificate string) (ssh.AuthMethod, error) {
rawPk, err := ssh.ParseRawPrivateKey([]byte(pk))
if err != nil {
return nil, fmt.Errorf("failed to parse private key %q: %s", pk, err)
return nil, fmt.Errorf("failed to parse private key: %s", err)
}

pcert, _, _, _, err := ssh.ParseAuthorizedKey([]byte(certificate))
if err != nil {
return nil, fmt.Errorf("failed to parse certificate %q: %s", certificate, err)
return nil, fmt.Errorf("failed to parse certificate: %s", err)
}

usigner, err := ssh.NewSignerFromKey(rawPk)
if err != nil {
return nil, fmt.Errorf("failed to create signer from raw private key %q: %s", rawPk, err)
return nil, fmt.Errorf("failed to create signer from private key: %s", err)
}

ucertSigner, err := ssh.NewCertSigner(pcert.(*ssh.Certificate), usigner)
if err != nil {
return nil, fmt.Errorf("failed to create cert signer %q: %s", usigner, err)
return nil, fmt.Errorf("failed to create cert signer: %s", err)
}

return ssh.PublicKeys(ucertSigner), nil
Expand Down