-
Notifications
You must be signed in to change notification settings - Fork 52.8k
fix(cli): strip ASCII control chars from getpass output on Windows #25133
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.
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
Open
john7864
wants to merge
1
commit into
NousResearch:main
Choose a base branch
from
john7864:fix/windows-getpass-control-chars
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| """Tests for ``read_secret_line()`` in hermes_cli.cli_output. | ||
|
|
||
| Guards against the regression where ``getpass.getpass()`` on Windows | ||
| leaks ``\\x00`` + scan-code sequences (from ``msvcrt.getwch()``) into | ||
| the returned string, producing API-key values that cannot be assigned | ||
| to ``os.environ`` (``ValueError: embedded null character``) or sent as | ||
| HTTP headers (ASCII encode error). | ||
| """ | ||
|
|
||
| from unittest.mock import patch | ||
|
|
||
| from hermes_cli.cli_output import read_secret_line | ||
|
|
||
|
|
||
| def test_strips_null_and_scan_code_pair(): | ||
| """Left-Arrow on Windows console emits ``\\x00K`` — both bytes must go.""" | ||
| with patch("hermes_cli.cli_output.getpass.getpass", return_value="\x00Ksk-test-abc"): | ||
| assert read_secret_line("prompt: ") == "Ksk-test-abc" | ||
|
|
||
|
|
||
| def test_strips_all_ascii_control_chars(): | ||
| """Every ``\\x00``-``\\x1f`` byte should be removed.""" | ||
| raw = "".join(chr(i) for i in range(32)) + "real-value" | ||
| with patch("hermes_cli.cli_output.getpass.getpass", return_value=raw): | ||
| assert read_secret_line("prompt: ") == "real-value" | ||
|
|
||
|
|
||
| def test_preserves_normal_input(): | ||
| """Regular printable input must pass through untouched.""" | ||
| with patch("hermes_cli.cli_output.getpass.getpass", return_value="sk-ant-xyz123"): | ||
| assert read_secret_line("prompt: ") == "sk-ant-xyz123" | ||
|
|
||
|
|
||
| def test_passes_prompt_through(): | ||
| """The prompt argument must reach ``getpass.getpass`` verbatim.""" | ||
| with patch("hermes_cli.cli_output.getpass.getpass", return_value="x") as mock: | ||
| read_secret_line("API key: ") | ||
| mock.assert_called_once_with("API key: ") |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This removes the
\x00prefix but leaves the printable scan-code byte (Kin the documented left-arrow sequence), so the corrupted secret is still modified. Consume the following character when the input contains a Windows\x00or\xe0special-key prefix; the paired-sequence test should then expectsk-test-abc.