Improve error message for encrypted SSH keys without password#2013
Merged
matheuscscp merged 1 commit intofluxcd:mainfrom Apr 1, 2026
Merged
Conversation
matheuscscp
approved these changes
Mar 28, 2026
Member
matheuscscp
left a comment
matheuscscp
left a comment
There was a problem hiding this comment.
LGTM! 🚀
I tested this PR and it's working.
hiddeco
reviewed
Mar 28, 2026
|
|
||
| // Check if SSH identity key is encrypted but no password was provided. | ||
| if opts.Transport == git.SSH && len(opts.Identity) > 0 && opts.Password == "" { | ||
| if _, err := ssh.ParseRawPrivateKey(opts.Identity); err != nil { |
Member
There was a problem hiding this comment.
I think the err != nil check here is redundant? Because if the error is nil, it wouldn't match the typed error?
Contributor
Author
|
Thanks @hiddeco — good catch! Removed the redundant |
Member
|
@ogulcanaydogan Can you pls squash and force-push? This PR should have a single commit. I will retest after that 🙏 |
Detect encrypted SSH identity keys early in getAuthOpts() by parsing with ssh.ParseRawPrivateKey and checking for PassphraseMissingError. When detected, return a clear error pointing the user to add the 'password' field to their Secret instead of the misleading "SSH agent requested but SSH_AUTH_SOCK not-specified" message. Fixes fluxcd#802 Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>
ogulcanaydogan
force-pushed
the
fix/802-ssh-password-error-message
branch
from
47cc4c9 to
790be38
Compare
Contributor
Author
|
Squashed into a single commit and rebased on latest main. Ready for retest. |
Member
|
Retested and still works. Thanks! |
Member
|
Successfully created backport PR for |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When users provide a password-protected SSH private key in their Secret but forget the
passwordfield, the current error is misleading:This doesn't hint at the actual problem. The fix detects encrypted keys early by parsing the identity with
ssh.ParseRawPrivateKeyand checking forssh.PassphraseMissingError. When detected, the error now reads:Changes
internal/controller/gitrepository_controller.go: Added encrypted key check ingetAuthOpts()after SSH auth options are constructed. Usesgolang.org/x/crypto/ssh.ParseRawPrivateKey+PassphraseMissingErrordetection.How it works
git.NewAuthOptions()returns with SSH transportIdentityis present butPasswordis emptyPassphraseMissingError, the key is encryptedNo behavior change for unencrypted keys or when password is provided.
Fixes #802