Passphrase fixups #906
Merged
Passphrase fixups #906
Conversation
This file contains 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
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
riyazdf
force-pushed
the
passphrase-retrieval-fixups
branch
from
5c19422
to
c7f0bab
Compare
| if err != nil { | ||
| continue | ||
| if err == nil { | ||
| break | ||
| } | ||
| if giveup || attempts > 10 { |
There was a problem hiding this comment.
Non-blocking: wondering if we should decrease this number to 3 or some such? That would give the user 5 tries. (currently it fails out after 12 tries - I was wondering whether that's too many)
There was a problem hiding this comment.
I agree. 10 is feeling like too many. Also would be good to move the exact number to a const.
|
Thank you for fixing this! LGTM - took it for a spin and it correctly terminates, and in a script without stdin it immediately fails. |
| if err != nil { | ||
| return "", false, err | ||
| } | ||
| term.DisableEcho(0, state) | ||
| defer term.RestoreTerminal(0, state) | ||
| term.DisableEcho(os.Stdin.Fd(), state) |
There was a problem hiding this comment.
Yeah, this is a good reason for us to switch to crypto/terminal in the future. Better API for retrieving passwords from the terminal.
|
LGTM. We can modify the number of retries separately |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes some logic in the keystore when counting number of passphrase attempts, especially when short passphrases are provided.
Also, ensures that
PromptRetriever()has an actual terminal when requesting passphrases and will error out withErrNoInputif that is not the case instead of trying to read input over and over.Closes #899
Closes #812