comparison mercurial/url.py @ 45759:ff48eea4a926 stable

url: do not continue HTTP authentication with user=None (issue6425)

I initially thought this is a py3-compat bug of passwordmgr._writedebug(),
but actually returning (None, str) pair is wrong at all. HTTP authentication
would continue with user="None" in that case.

Since registering a password of user=None should also be wrong, this patch
simply adds early return.

45758:14ac6a74e7e7

            else:
                user = self.ui.prompt(_(b"user:"), default=None)

            if not passwd:
                passwd = self.ui.getpass()

        self.passwddb.add_password(realm, authuri, user, passwd)
        self._writedebug(user, passwd)
        return (pycompat.strurl(user), pycompat.strurl(passwd))

45759:ff48eea4a926

            else:
                user = self.ui.prompt(_(b"user:"), default=None)

            if not passwd:
                passwd = self.ui.getpass()

        # As of Python 3.8, the default implementation of
        # AbstractBasicAuthHandler.retry_http_basic_auth() assumes the user
        # is set if pw is not None. This means (None, str) is not a valid
        # return type of find_user_password().
        if user is None:
            return None, None

        self.passwddb.add_password(realm, authuri, user, passwd)
        self._writedebug(user, passwd)
        return (pycompat.strurl(user), pycompat.strurl(passwd))