Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixes issue7208 - getpass would still allow the password to be echoed on 

Solaris due to not flushing the input buffer.

This change also incorporates some additional getpass implementation
suggestions for security based on an analysis of getpass.c linked to from the
issue.
This commit is contained in:
Gregory P. Smith 2009-10-31 21:26:08 +00:00
parent b2b92ea7bc
commit 29b5365f69
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/getpass.py
View File

@ -62,12 +62,16 @@ def unix_getpass(prompt='Password: ', stream=None):
try: try:
old = termios.tcgetattr(fd) # a copy to save old = termios.tcgetattr(fd) # a copy to save
new = old[:] new = old[:]
new[3] &= ~termios.ECHO # 3 == 'lflags' new[3] &= ~(termios.ECHO|termios.ISIG) # 3 == 'lflags'
tcsetattr_flags = termios.TCSAFLUSH
if hasattr(termios, 'TCSASOFT'):
tcsetattr_flags |= termios.TCSASOFT
try: try:
termios.tcsetattr(fd, termios.TCSADRAIN, new) termios.tcsetattr(fd, tcsetattr_flags, new)
passwd = _raw_input(prompt, stream, input=input) passwd = _raw_input(prompt, stream, input=input)
finally: finally:
termios.tcsetattr(fd, termios.TCSADRAIN, old) termios.tcsetattr(fd, tcsetattr_flags, old)
stream.flush() # issue7208
except termios.error, e: except termios.error, e:
if passwd is not None: if passwd is not None:
# _raw_input succeeded. The final tcsetattr failed. Reraise # _raw_input succeeded. The final tcsetattr failed. Reraise
@ -125,6 +129,7 @@ def _raw_input(prompt="", stream=None, input=None):
if prompt: if prompt:
stream.write(prompt) stream.write(prompt)
stream.flush() stream.flush()
# NOTE: The Python C API calls flockfile() (and unlock) during readline.
line = input.readline() line = input.readline()
if not line: if not line:
raise EOFError raise EOFError