mirror of
https://github.com/gravitational/teleport.git
synced 2026-11-02 23:04:43 +08:00
Alan Parra
0ecf31de0e
Fixes an issue with ContextReader on `bash` where abandoned password reads cause the terminal to remain "locked" even after `tsh` exits. 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 `zsh` or `fish`. Repro steps: ```shell $ bash # repro #1 $ ./tsh login --proxy=example.com > Enter password for Teleport user llama: <CTRL-C> # shell is now locked # repro #2 # (Use an account with security key and OTP MFA.) $ ./tsh login --proxy=example.com > Enter password for Teleport user llama: <enters password> > Tap any security key or enter a code from a OTP device <taps security key> # shell is now locked ``` * Restore terminal state on interrupt or exit * Notify prompt on tsh exit * Review: context.WithTimeout and Notify on os.Exit
71 lines
1.8 KiB
Go
71 lines
1.8 KiB
Go
/*
|
|
Copyright 2021 Gravitational, Inc.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package prompt
|
|
|
|
import (
|
|
"os"
|
|
"sync"
|
|
)
|
|
|
|
var (
|
|
stdinMU sync.Mutex
|
|
stdin StdinReader
|
|
)
|
|
|
|
// StdinReader contains ContextReader methods applicable to stdin.
|
|
type StdinReader interface {
|
|
Reader
|
|
SecureReader
|
|
}
|
|
|
|
// Stdin returns a singleton ContextReader wrapped around os.Stdin.
|
|
//
|
|
// os.Stdin should not be used directly after the first call to this function
|
|
// to avoid losing data.
|
|
func Stdin() StdinReader {
|
|
stdinMU.Lock()
|
|
defer stdinMU.Unlock()
|
|
if stdin == nil {
|
|
cr := NewContextReader(os.Stdin)
|
|
go cr.handleInterrupt()
|
|
stdin = cr
|
|
}
|
|
return stdin
|
|
}
|
|
|
|
// SetStdin allows callers to change the Stdin reader.
|
|
// Useful to replace Stdin for tests, but should be avoided in production code.
|
|
func SetStdin(rd StdinReader) {
|
|
stdinMU.Lock()
|
|
defer stdinMU.Unlock()
|
|
stdin = rd
|
|
}
|
|
|
|
// NotifyExit notifies prompt singletons, such as Stdin, that the program is
|
|
// about to exit. This allows singletons to perform actions such as restoring
|
|
// terminal state.
|
|
// Once NotifyExit is called the singletons will be closed.
|
|
func NotifyExit() {
|
|
// Note: don't call methods such as Stdin() here, we don't want to
|
|
// inadvertently hijack the prompts on exit.
|
|
stdinMU.Lock()
|
|
if cr, ok := stdin.(*ContextReader); ok {
|
|
_ = cr.Close()
|
|
}
|
|
stdinMU.Unlock()
|
|
}
|