KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use getpass() to read the password from STDIN when it is a tty

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-11 05:20:05 +05:30
parent 20cffc728e
commit 2e422e5ba8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kitty/remote_control.py
View File

@ -402,18 +402,22 @@ def get_password(opts: RCOptions) -> str:
ans = opts.password
if not ans and opts.password_file:
if opts.password_file == '-':
ans = sys.stdin.read().strip()
try:
tty_fd = os.open(os.ctermid(), os.O_RDONLY | os.O_CLOEXEC)
except OSError:
pass
if sys.stdin.isatty():
from getpass import getpass
ans = getpass()
else:
with open(tty_fd, closefd=True):
os.dup2(tty_fd, sys.stdin.fileno())
ans = sys.stdin.read().rstrip()
try:
tty_fd = os.open(os.ctermid(), os.O_RDONLY | os.O_CLOEXEC)
except OSError:
pass
else:
with open(tty_fd, closefd=True):
os.dup2(tty_fd, sys.stdin.fileno())
else:
try:
with open(resolve_custom_file(opts.password_file)) as f:
ans = f.read().strip()
ans = f.read().rstrip()
except OSError:
pass
if not ans and opts.password_env: