comparison mercurial/ui.py @ 47079:5b3513177f2b stable

util: avoid echoing the password to the console on Windows py3 (issue6446) The `getpass.getpass()` implementation on Windows first checks if `sys.stdin` and `sys.__stdin__` are the same object. It's not on py3 because the former is replaced in dispatch.py with something that doesn't normalize '\n' to '\r\n'. When they aren't the same object, it simply calls `sys.stdin.readline()` instead of the mscvrt functions that read the input characters before they are echoed. This simply copies the `getpass.win_getpass()` implementation without the stdin check, and byteifies around the edges. I'm not sure if there's a reasonable replacement for the check that we could implement. When echoing input into the hg command, the `ui.interactive()` check causes `ui.getpass()` to bail before getting here. If the proper config switches are used to bypass that and call this, the process stalls until '\n' is input into the console. So there could be a deadlock here when run by another command if the wrong config settings are applied. Differential Revision: https://phab.mercurial-scm.org/D10708
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 12 May 2021 12:41:52 -0400
parents b03527bdac01
children bcafcd779d2e
comparison
equal deleted inserted replaced
47068:3af293735d0f 47079:5b3513177f2b
9 9
10 import collections 10 import collections
11 import contextlib 11 import contextlib
12 import datetime 12 import datetime
13 import errno 13 import errno
14 import getpass
15 import inspect 14 import inspect
16 import os 15 import os
17 import re 16 import re
18 import signal 17 import signal
19 import socket 18 import socket
1777 l = self._fin.readline() 1776 l = self._fin.readline()
1778 if not l: 1777 if not l:
1779 raise EOFError 1778 raise EOFError
1780 return l.rstrip(b'\n') 1779 return l.rstrip(b'\n')
1781 else: 1780 else:
1782 return encoding.strtolocal(getpass.getpass('')) 1781 return util.get_password()
1783 except EOFError: 1782 except EOFError:
1784 raise error.ResponseExpected() 1783 raise error.ResponseExpected()
1785 1784
1786 def status(self, *msg, **opts): 1785 def status(self, *msg, **opts):
1787 """write status message to output (if ui.quiet is False) 1786 """write status message to output (if ui.quiet is False)