Restore terminal state on interrupt or exit #13382
Merged
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
github-actions
bot
added
the
tsh
|
Thanks @nklaassen for the initial report. Planning on backporting to branch/v10. |
zmb3
approved these changes
Jun 10, 2022
| } | ||
|
|
||
| // iAmHoldingTheLock exists only to draw attention to the need to hold the lock. | ||
| type iAmHoldingTheLock struct{} |
There was a problem hiding this comment.
Haven't seen this one before. In most places we just suffix the method name with Locked to indicate that you should hold the lock before calling.
Not that there's anything wrong with this. It's just different.
There was a problem hiding this comment.
I can do the Locked suffix too, no strong preferences as long as something calls attention to it.
espadolini
approved these changes
Jun 10, 2022
nklaassen
reviewed
Jun 10, 2022
codingllama
force-pushed
the
codingllama/contextreader-interrupt
branch
from
a9e2e3b to
4466534
Compare
|
Addressed comments, PTAL? |
nklaassen
approved these changes
Jun 10, 2022
|
Thanks everyone, I'll merge while it's green. |
codingllama
added a commit
that referenced
this pull request
Jun 23, 2022
codingllama
added a commit
that referenced
this pull request
Jun 24, 2022
codingllama
added a commit
that referenced
this pull request
Jun 24, 2022
`prompt.ContextReader`, along with various parts of `lib/utils/prompt`, where re-written in master so we can alleviate input swallowing issues. For various reasons I didn't backport all changes to v9, but the less-eager input-swallowing loop is now what stands between us and issue #13021. This isn't a backport of a specific PR, but instead a port of the entire `lib/utils/prompt` package, as the PRs that touch the package unfortunately do more than we want to backport. The interfaces are still compatible and I did test various `tsh login` and `tsh ssh` scenarios. I've thrown in #13382 for good measure, as well. Closes #13021. * Backport lib/utils/prompt improvements * Fix lib/client tests * Restore terminal state on exit (#13382)
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 an issue with ContextReader on
bashwhere abandoned password reads cause the terminal to remain "locked" even aftertshexits. This happens on interrupts but also on regular exit if the user picks a security key in the dual security key/OTP login prompt.Doesn't seem to affect shells like
zshorfish.Repro steps: