mercurial-scm/hg-stable: mercurial/url.py annotate

annotate mercurial/url.py @ 47682:78f7f0d490ee

dirstate-v2: Move fixed-size tree metadata into the docket file Before this changeset, the dirstate-v2 data file contained not only nodes and paths that may be reused when appending to an existing file, but also some fixed-size metadata that applies to the entire tree and was added at the end of the data file for every append. This moves that metadata into the docket file, so that repeated "append" operations without meaningful changes don?t actually need to grow any file. Differential Revision: https://phab.mercurial-scm.org/D11098

author	Simon Sapin <simon.sapin@octobus.net>
date	Thu, 15 Jul 2021 23:02:17 +0200
parents	8e5192e41e0b
children	51b07ac1991c 6000f5b25c9b

rev	line source
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	1 # url.py - HTTP handling for mercurial
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	2 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	3 # Copyright 2005, 2006, 2007, 2008 Olivia Mackall <olivia@selenic.com>
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	4 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	6 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8208 diff changeset	7 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9852 diff changeset	8 # GNU General Public License version 2 or any later version.
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	9
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	10 from __future__ import absolute_import
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	11
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	12 import base64
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	13 import socket
37103 9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	14 import sys
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	15
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	16 from .i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	17 from .pycompat import getattr
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	18 from . import (
30820 6a70cf94d1b5 py3: replace pycompat.getenv with encoding.environ.get Pulkit Goyal <7895pulkit@gmail.com> parents: 30763 diff changeset	19 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25990 diff changeset	20 error,
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	21 httpconnection as httpconnectionmod,
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	22 keepalive,
34429 0ee9cf8d054a url: use native strings for header values Augie Fackler <augie@google.com> parents: 33499 diff changeset	23 pycompat,
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	24 sslutil,
34467 1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	25 urllibcompat,
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	26 util,
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	27 )
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	28 from .utils import (
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	29 stringutil,
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	30 urlutil,
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	31 )
29455 0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29379 diff changeset	32
0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29379 diff changeset	33 httplib = util.httplib
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 26806 diff changeset	34 stringio = util.stringio
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	35 urlerr = util.urlerr
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	36 urlreq = util.urlreq
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	37
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	38
34694 2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	39 def escape(s, quote=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45758 diff changeset	40 """Replace special characters "&", "<" and ">" to HTML-safe sequences.
34694 2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	41 If the optional flag quote is true, the quotation mark character (")
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	42 is also translated.
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	43
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	44 This is the same as cgi.escape in Python, but always operates on
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	45 bytes, whereas cgi.escape in Python 3 only works on unicodes.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45758 diff changeset	46 """
34694 2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	47 s = s.replace(b"&", b"&")
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	48 s = s.replace(b"<", b"<")
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	49 s = s.replace(b">", b">")
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	50 if quote:
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	51 s = s.replace(b'"', b""")
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	52 return s
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	53
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	54
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	55 class passwordmgr(object):
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	56 def __init__(self, ui, passwddb):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	57 self.ui = ui
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	58 self.passwddb = passwddb
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	59
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	60 def add_password(self, realm, uri, user, passwd):
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	61 return self.passwddb.add_password(realm, uri, user, passwd)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	62
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	63 def find_user_password(self, realm, authuri):
41469 bc776c31c093 url: add some defensive asserts on expected incoming types Augie Fackler <augie@google.com> parents: 40044 diff changeset	64 assert isinstance(realm, (type(None), str))
bc776c31c093 url: add some defensive asserts on expected incoming types Augie Fackler <augie@google.com> parents: 40044 diff changeset	65 assert isinstance(authuri, str)
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	66 authinfo = self.passwddb.find_user_password(realm, authuri)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	67 user, passwd = authinfo
41470 d437d1e2a711 url: convert some variables back to bytes Augie Fackler <augie@google.com> parents: 41469 diff changeset	68 user, passwd = pycompat.bytesurl(user), pycompat.bytesurl(passwd)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	69 if user and passwd:
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	70 self._writedebug(user, passwd)
41603 349c8879becd py3: ensure the HTTP password manager returns strings, not bytes Matt Harbison <matt_harbison@yahoo.com> parents: 41470 diff changeset	71 return (pycompat.strurl(user), pycompat.strurl(passwd))
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	72
15005 4a43e23b8c55 hgweb: do not ignore [auth] if url has a username (issue2822) Patrick Mezard <pmezard@gmail.com> parents: 14244 diff changeset	73 if not user or not passwd:
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	74 res = httpconnectionmod.readauthforuri(self.ui, authuri, user)
13372 5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	75 if res:
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	76 group, auth = res
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	77 user, passwd = auth.get(b'username'), auth.get(b'password')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	78 self.ui.debug(b"using auth.%s.* for authentication\n" % group)
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	79 if not user or not passwd:
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	80 u = urlutil.url(pycompat.bytesurl(authuri))
20291 7d589d923b8a url: added authuri when login information is requested (issue3209) Lucas Moscovicz <lmoscovicz@fb.com> parents: 20174 diff changeset	81 u.query = None
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	82 if not self.ui.interactive():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	83 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	84 _(b'http authorization required for %s')
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	85 % urlutil.hidepassword(bytes(u))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	86 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	87
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	88 self.ui.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	89 _(b"http authorization required for %s\n")
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	90 % urlutil.hidepassword(bytes(u))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	91 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	92 self.ui.write(_(b"realm: %s\n") % pycompat.bytesurl(realm))
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	93 if user:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	94 self.ui.write(_(b"user: %s\n") % user)
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	95 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	96 user = self.ui.prompt(_(b"user:"), default=None)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	97
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	98 if not passwd:
89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	99 passwd = self.ui.getpass()
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	100
45758 ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	101 # As of Python 3.8, the default implementation of
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	102 # AbstractBasicAuthHandler.retry_http_basic_auth() assumes the user
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	103 # is set if pw is not None. This means (None, str) is not a valid
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	104 # return type of find_user_password().
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	105 if user is None:
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	106 return None, None
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	107
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	108 self.passwddb.add_password(realm, authuri, user, passwd)
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	109 self._writedebug(user, passwd)
41603 349c8879becd py3: ensure the HTTP password manager returns strings, not bytes Matt Harbison <matt_harbison@yahoo.com> parents: 41470 diff changeset	110 return (pycompat.strurl(user), pycompat.strurl(passwd))
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	111
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	112 def _writedebug(self, user, passwd):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	113 msg = _(b'http auth: user %s, password %s\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 self.ui.debug(msg % (user, passwd and b'' len(passwd) or b'not set'))
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	115
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	116 def find_stored_password(self, authuri):
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	117 return self.passwddb.find_user_password(None, authuri)
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	118
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	119
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	120 class proxyhandler(urlreq.proxyhandler):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	121 def __init__(self, ui):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	122 proxyurl = ui.config(b"http_proxy", b"host") or encoding.environ.get(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	123 b'http_proxy'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	124 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	125 # XXX proxyauthinfo = None
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	126
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	127 if proxyurl:
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	128 # proxy can be proper url or host[:port]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	129 if not (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	130 proxyurl.startswith(b'http:') or proxyurl.startswith(b'https:')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	131 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	132 proxyurl = b'http://' + proxyurl + b'/'
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	133 proxy = urlutil.url(proxyurl)
13820 65b89e80f892 url: use url.url in proxyhandler Brodie Rao <brodie@bitheap.org> parents: 13819 diff changeset	134 if not proxy.user:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	135 proxy.user = ui.config(b"http_proxy", b"user")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	136 proxy.passwd = ui.config(b"http_proxy", b"passwd")
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	137
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	138 # see if we should use a proxy for this url
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	139 no_list = [b"localhost", b"127.0.0.1"]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	140 no_list.extend(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	141 [p.lower() for p in ui.configlist(b"http_proxy", b"no")]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	142 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	143 no_list.extend(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	144 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	145 p.strip().lower()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	146 for p in encoding.environ.get(b"no_proxy", b'').split(b',')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	147 if p.strip()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	148 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	149 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	150 # "http_proxy.always" config is for running tests on localhost
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	151 if ui.configbool(b"http_proxy", b"always"):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	152 self.no_list = []
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	153 else:
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	154 self.no_list = no_list
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	155
41721 4028897dfa05 url: always use str for proxy configuration Gregory Szorc <gregory.szorc@gmail.com> parents: 41719 diff changeset	156 # Keys and values need to be str because the standard library
4028897dfa05 url: always use str for proxy configuration Gregory Szorc <gregory.szorc@gmail.com> parents: 41719 diff changeset	157 # expects them to be.
4028897dfa05 url: always use str for proxy configuration Gregory Szorc <gregory.szorc@gmail.com> parents: 41719 diff changeset	158 proxyurl = str(proxy)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	159 proxies = {'http': proxyurl, 'https': proxyurl}
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	160 ui.debug(
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	161 b'proxying through %s\n' % urlutil.hidepassword(bytes(proxy))
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	162 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	163 else:
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	164 proxies = {}
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	165
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	166 urlreq.proxyhandler.__init__(self, proxies)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	167 self.ui = ui
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	168
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	169 def proxy_open(self, req, proxy, type_):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	170 host = pycompat.bytesurl(urllibcompat.gethost(req)).split(b':')[0]
19535 df2155ebf502 proxy: allow wildcards in the no proxy list (issue1821) Matt Mackall <mpm@selenic.com> parents: 18176 diff changeset	171 for e in self.no_list:
df2155ebf502 proxy: allow wildcards in the no proxy list (issue1821) Matt Mackall <mpm@selenic.com> parents: 18176 diff changeset	172 if host == e:
df2155ebf502 proxy: allow wildcards in the no proxy list (issue1821) Matt Mackall <mpm@selenic.com> parents: 18176 diff changeset	173 return None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	174 if e.startswith(b'*.') and host.endswith(e[2:]):
19535 df2155ebf502 proxy: allow wildcards in the no proxy list (issue1821) Matt Mackall <mpm@selenic.com> parents: 18176 diff changeset	175 return None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	176 if e.startswith(b'.') and host.endswith(e[1:]):
19535 df2155ebf502 proxy: allow wildcards in the no proxy list (issue1821) Matt Mackall <mpm@selenic.com> parents: 18176 diff changeset	177 return None
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	178
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	179 return urlreq.proxyhandler.proxy_open(self, req, proxy, type_)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	180
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	181
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	182 def _gen_sendfile(orgsend):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	183 def _sendfile(self, data):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	184 # send a file
14244 e7525a555a64 url: use new http support if requested by the user Augie Fackler <durin42@gmail.com> parents: 14204 diff changeset	185 if isinstance(data, httpconnectionmod.httpsendfile):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	186 # if auth required, some data sent twice, so rewind here
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	187 data.seek(0)
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	188 for chunk in util.filechunkiter(data):
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	189 orgsend(self, chunk)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	190 else:
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	191 orgsend(self, data)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	192
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	193 return _sendfile
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	194
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	195
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	196 has_https = util.safehasattr(urlreq, b'httpshandler')
10409 4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	197
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	198
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	199 class httpconnection(keepalive.HTTPConnection):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	200 # must be able to send big bundle as stream.
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	201 send = _gen_sendfile(keepalive.HTTPConnection.send)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	202
8590 59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	203 def getresponse(self):
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	204 proxyres = getattr(self, 'proxyres', None)
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	205 if proxyres:
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	206 if proxyres.will_close:
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	207 self.close()
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	208 self.proxyres = None
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	209 return proxyres
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	210 return keepalive.HTTPConnection.getresponse(self)
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	211
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	212
41719 d20f1594ff4a url: always access req._tunnel_host Gregory Szorc <gregory.szorc@gmail.com> parents: 41603 diff changeset	213 # Large parts of this function have their origin from before Python 2.6
d20f1594ff4a url: always access req._tunnel_host Gregory Szorc <gregory.szorc@gmail.com> parents: 41603 diff changeset	214 # and could potentially be removed.
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	215 def _generic_start_transaction(handler, h, req):
41719 d20f1594ff4a url: always access req._tunnel_host Gregory Szorc <gregory.szorc@gmail.com> parents: 41603 diff changeset	216 tunnel_host = req._tunnel_host
14964 376c32a5ccdc url: replace uses of hasattr with safehasattr or getattr Augie Fackler <durin42@gmail.com> parents: 14244 diff changeset	217 if tunnel_host:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	218 if tunnel_host[:7] not in ['http://', 'https:/']:
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	219 tunnel_host = 'https://' + tunnel_host
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	220 new_tunnel = True
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	221 else:
34467 1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	222 tunnel_host = urllibcompat.getselector(req)
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	223 new_tunnel = False
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	224
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	225 if new_tunnel or tunnel_host == urllibcompat.getfullurl(req): # has proxy
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	226 u = urlutil.url(pycompat.bytesurl(tunnel_host))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	227 if new_tunnel or u.scheme == b'https': # only use CONNECT for HTTPS
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	228 h.realhostport = b':'.join([u.host, (u.port or b'443')])
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	229 h.headers = req.headers.copy()
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	230 h.headers.update(handler.parent.addheaders)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	231 return
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	232
10415 677f15da38c1 url: proxy handling, simplify and correctly deal with IPv6 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10411 diff changeset	233 h.realhostport = None
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	234 h.headers = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	235
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	236
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	237 def _generic_proxytunnel(self):
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43554 diff changeset	238 proxyheaders = {
44766 a50f33f1ff24 url: fix a bytes vs str crash in processing proxy headers (issue6249) Matt Harbison <matt_harbison@yahoo.com> parents: 44645 diff changeset	239 pycompat.bytestr(x): pycompat.bytestr(self.headers[x])
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43554 diff changeset	240 for x in self.headers
9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43554 diff changeset	241 if x.lower().startswith('proxy-')
9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43554 diff changeset	242 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	243 self.send(b'CONNECT %s HTTP/1.0\r\n' % self.realhostport)
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	244 for header in pycompat.iteritems(proxyheaders):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	245 self.send(b'%s: %s\r\n' % header)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	246 self.send(b'\r\n')
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	247
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	248 # majority of the following code is duplicated from
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	249 # httplib.HTTPConnection as there are no adequate places to
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	250 # override functions to provide the needed functionality
41722 544035846830 url: don't pass strict argument on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 41721 diff changeset	251 # strict was removed in Python 3.4.
544035846830 url: don't pass strict argument on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 41721 diff changeset	252 kwargs = {}
544035846830 url: don't pass strict argument on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 41721 diff changeset	253 if not pycompat.ispy3:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	254 kwargs[b'strict'] = self.strict
41722 544035846830 url: don't pass strict argument on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 41721 diff changeset	255
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	256 res = self.response_class(self.sock, method=self._method, **kwargs)
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	257
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	258 while True:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	259 version, status, reason = res._read_status()
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	260 if status != httplib.CONTINUE:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	261 break
29741 44ea12756fef url: use `iter(callable, sentinel)` instead of while True Augie Fackler <augie@google.com> parents: 29682 diff changeset	262 # skip lines that are all whitespace
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	263 list(iter(lambda: res.fp.readline().strip(), b''))
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	264 res.status = status
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	265 res.reason = reason.strip()
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	266
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	267 if res.status == 200:
29741 44ea12756fef url: use `iter(callable, sentinel)` instead of while True Augie Fackler <augie@google.com> parents: 29682 diff changeset	268 # skip lines until we find a blank line
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	269 list(iter(res.fp.readline, b'\r\n'))
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	270 return True
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	271
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	272 if version == b'HTTP/1.0':
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	273 res.version = 10
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	274 elif version.startswith(b'HTTP/1.'):
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	275 res.version = 11
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	276 elif version == b'HTTP/0.9':
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	277 res.version = 9
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	278 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	279 raise httplib.UnknownProtocol(version)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	280
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	281 if res.version == 9:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	282 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	283 res.chunked = 0
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	284 res.will_close = 1
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 26806 diff changeset	285 res.msg = httplib.HTTPMessage(stringio())
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	286 return False
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	287
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	288 res.msg = httplib.HTTPMessage(res.fp)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	289 res.msg.fp = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	290
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	291 # are we using the chunked-style of transfer encoding?
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	292 trenc = res.msg.getheader(b'transfer-encoding')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	293 if trenc and trenc.lower() == b"chunked":
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	294 res.chunked = 1
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	295 res.chunk_left = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	296 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	297 res.chunked = 0
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	298
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	299 # will the connection close at the end of the response?
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	300 res.will_close = res._check_close()
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	301
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	302 # do we have a Content-Length?
17428 72803c8edaa4 avoid using abbreviations that look like spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17424 diff changeset	303 # NOTE: RFC 2616, section 4.4, #3 says we ignore this if
72803c8edaa4 avoid using abbreviations that look like spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17424 diff changeset	304 # transfer-encoding is "chunked"
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	305 length = res.msg.getheader(b'content-length')
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	306 if length and not res.chunked:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	307 try:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	308 res.length = int(length)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	309 except ValueError:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	310 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	311 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	312 if res.length < 0: # ignore nonsensical negative lengths
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	313 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	314 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	315 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	316
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	317 # does the body have a fixed length? (of zero)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	318 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	319 status == httplib.NO_CONTENT
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	320 or status == httplib.NOT_MODIFIED
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	321 or 100 <= status < 200
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	322 or res._method == b'HEAD' # 1xx codes
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	323 ):
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	324 res.length = 0
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	325
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	326 # if the connection remains open, and we aren't using chunked, and
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	327 # a content-length was not provided, then assume that the connection
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	328 # WILL close.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	329 if not res.will_close and not res.chunked and res.length is None:
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	330 res.will_close = 1
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	331
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	332 self.proxyres = res
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	333
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	334 return False
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	335
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	336
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	337 class httphandler(keepalive.HTTPHandler):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	338 def http_open(self, req):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	339 return self.do_open(httpconnection, req)
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	340
8590 59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	341 def _start_transaction(self, h, req):
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	342 _generic_start_transaction(self, h, req)
8590 59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	343 return keepalive.HTTPHandler._start_transaction(self, h, req)
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	344
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	345
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	346 class logginghttpconnection(keepalive.HTTPConnection):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	347 def __init__(self, createconn, args, *kwargs):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	348 keepalive.HTTPConnection.__init__(self, args, *kwargs)
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	349 self._create_connection = createconn
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	350
37103 9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	351 if sys.version_info < (2, 7, 7):
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	352 # copied from 2.7.14, since old implementations directly call
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	353 # socket.create_connection()
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	354 def connect(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	355 self.sock = self._create_connection(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	356 (self.host, self.port), self.timeout, self.source_address
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	357 )
37103 9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	358 if self._tunnel_host:
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	359 self._tunnel()
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	360
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	361
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	362 class logginghttphandler(httphandler):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	363 """HTTP handler that logs socket I/O."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	364
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	365 def __init__(self, logfh, name, observeropts, timeout=None):
6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	366 super(logginghttphandler, self).__init__(timeout=timeout)
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	367
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	368 self._logfh = logfh
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	369 self._logname = name
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	370 self._observeropts = observeropts
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	371
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	372 # do_open() calls the passed class to instantiate an HTTPConnection. We
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	373 # pass in a callable method that creates a custom HTTPConnection instance
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	374 # whose callback to create the socket knows how to proxy the socket.
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	375 def http_open(self, req):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	376 return self.do_open(self._makeconnection, req)
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	377
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	378 def _makeconnection(self, args, *kwargs):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	379 def createconnection(args, *kwargs):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	380 sock = socket.create_connection(args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	381 return util.makeloggingsocket(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	382 self._logfh, sock, self._logname, **self._observeropts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	383 )
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	384
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	385 return logginghttpconnection(createconnection, args, *kwargs)
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	386
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	387
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	388 if has_https:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	389
40032 f2dffa1359c6 url: have httpsconnection inherit from our custom HTTPConnection Gregory Szorc <gregory.szorc@gmail.com> parents: 40019 diff changeset	390 class httpsconnection(keepalive.HTTPConnection):
13424 08f9c587141f url: merge BetterHTTPS with httpsconnection to get some proxy https validation Mads Kiilerich <mads@kiilerich.com> parents: 13422 diff changeset	391 response_class = keepalive.HTTPResponse
25414 f7ccbc2776b7 https: do not inherit httplib.HTTPSConnection that creates unused SSLContext Yuya Nishihara <yuya@tcha.org> parents: 25207 diff changeset	392 default_port = httplib.HTTPS_PORT
13424 08f9c587141f url: merge BetterHTTPS with httpsconnection to get some proxy https validation Mads Kiilerich <mads@kiilerich.com> parents: 13422 diff changeset	393 # must be able to send big bundle as stream.
08f9c587141f url: merge BetterHTTPS with httpsconnection to get some proxy https validation Mads Kiilerich <mads@kiilerich.com> parents: 13422 diff changeset	394 send = _gen_sendfile(keepalive.safesend)
25414 f7ccbc2776b7 https: do not inherit httplib.HTTPSConnection that creates unused SSLContext Yuya Nishihara <yuya@tcha.org> parents: 25207 diff changeset	395 getresponse = keepalive.wrapgetresponse(httplib.HTTPConnection)
f7ccbc2776b7 https: do not inherit httplib.HTTPSConnection that creates unused SSLContext Yuya Nishihara <yuya@tcha.org> parents: 25207 diff changeset	396
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	397 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	398 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	399 host,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	400 port=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	401 key_file=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	402 cert_file=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	403 *args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	404 **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	405 ):
40032 f2dffa1359c6 url: have httpsconnection inherit from our custom HTTPConnection Gregory Szorc <gregory.szorc@gmail.com> parents: 40019 diff changeset	406 keepalive.HTTPConnection.__init__(self, host, port, args, *kwargs)
25414 f7ccbc2776b7 https: do not inherit httplib.HTTPSConnection that creates unused SSLContext Yuya Nishihara <yuya@tcha.org> parents: 25207 diff changeset	407 self.key_file = key_file
f7ccbc2776b7 https: do not inherit httplib.HTTPSConnection that creates unused SSLContext Yuya Nishihara <yuya@tcha.org> parents: 25207 diff changeset	408 self.cert_file = cert_file
9726 430e59ff3437 keepalive: handle broken pipes gracefully during large POSTs Augie Fackler <durin42@gmail.com> parents: 9467 diff changeset	409
10409 4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	410 def connect(self):
29682 b76ea1384bf2 url: drop compatibility wrapper of socket.create_connection() Yuya Nishihara <yuya@tcha.org> parents: 29639 diff changeset	411 self.sock = socket.create_connection((self.host, self.port))
13422 ebce5196b9db url: always create BetterHTTPS connections the same way Mads Kiilerich <mads@kiilerich.com> parents: 13421 diff changeset	412
13421 bd8bfa85d5a5 url: refactor BetterHTTPS.connect Mads Kiilerich <mads@kiilerich.com> parents: 13420 diff changeset	413 host = self.host
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	414 if self.realhostport: # use CONNECT proxy
14064 e4bfb9c337f3 remove unused imports and variables Alexander Solovyov <alexander@solovyov.net> parents: 13902 diff changeset	415 _generic_proxytunnel(self)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	416 host = self.realhostport.rsplit(b':', 1)[0]
25429 9d1c61715939 ssl: rename ssl_wrap_socket() to conform to our naming convention Yuya Nishihara <yuya@tcha.org> parents: 25415 diff changeset	417 self.sock = sslutil.wrapsocket(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	418 self.sock,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	419 self.key_file,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	420 self.cert_file,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	421 ui=self.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	422 serverhostname=host,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	423 )
29227 dffe78d80a6c sslutil: convert socket validation from a class to a function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 28883 diff changeset	424 sslutil.validatesocket(self.sock)
10409 4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	425
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	426 class httpshandler(keepalive.KeepAliveHandler, urlreq.httpshandler):
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	427 def __init__(self, ui, timeout=None):
6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	428 keepalive.KeepAliveHandler.__init__(self, timeout=timeout)
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	429 urlreq.httpshandler.__init__(self)
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	430 self.ui = ui
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	431 self.pwmgr = passwordmgr(self.ui, self.ui.httppasswordmgrdb)
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	432
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	433 def _start_transaction(self, h, req):
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	434 _generic_start_transaction(self, h, req)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	435 return keepalive.KeepAliveHandler._start_transaction(self, h, req)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	436
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	437 def https_open(self, req):
34467 1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	438 # urllibcompat.getfullurl() does not contain credentials
1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	439 # and we may need them to match the certificates.
1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	440 url = urllibcompat.getfullurl(req)
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	441 user, password = self.pwmgr.find_stored_password(url)
0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	442 res = httpconnectionmod.readauthforuri(self.ui, url, user)
13372 5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	443 if res:
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	444 group, auth = res
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	445 self.auth = auth
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	446 self.ui.debug(b"using auth.%s.* for authentication\n" % group)
13372 5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	447 else:
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	448 self.auth = None
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	449 return self.do_open(self._makeconnection, req)
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	450
10408 50fb1fe143ff url: httplib.HTTPSConnection already handles IPv6 and port parsing fine Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	451 def _makeconnection(self, host, port=None, args, *kwargs):
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	452 keyfile = None
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	453 certfile = None
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	454
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	455 if len(args) >= 1: # key_file
10511 6f61c480f51c url: args argument is a tuple, not a list (found by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10484 diff changeset	456 keyfile = args[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	457 if len(args) >= 2: # cert_file
10511 6f61c480f51c url: args argument is a tuple, not a list (found by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10484 diff changeset	458 certfile = args[1]
6f61c480f51c url: args argument is a tuple, not a list (found by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10484 diff changeset	459 args = args[2:]
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	460
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	461 # if the user has specified different key/cert files in
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	462 # hgrc, we prefer these
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	463 if self.auth and b'key' in self.auth and b'cert' in self.auth:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	464 keyfile = self.auth[b'key']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	465 certfile = self.auth[b'cert']
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	466
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	467 conn = httpsconnection(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	468 host, port, keyfile, certfile, args, *kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	469 )
10409 4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	470 conn.ui = self.ui
4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	471 return conn
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	472
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	473
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	474 class httpdigestauthhandler(urlreq.httpdigestauthhandler):
11457 2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	475 def __init__(self, args, *kwargs):
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	476 urlreq.httpdigestauthhandler.__init__(self, args, *kwargs)
11457 2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	477 self.retried_req = None
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	478
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	479 def reset_retry_count(self):
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	480 # Python 2.6.5 will call this on 401 or 407 errors and thus loop
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	481 # forever. We disable reset_retry_count completely and reset in
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	482 # http_error_auth_reqed instead.
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	483 pass
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	484
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	485 def http_error_auth_reqed(self, auth_header, host, req, headers):
11457 2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	486 # Reset the retry counter once for each request.
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	487 if req is not self.retried_req:
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	488 self.retried_req = req
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	489 self.retried = 0
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	490 return urlreq.httpdigestauthhandler.http_error_auth_reqed(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	491 self, auth_header, host, req, headers
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	492 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	493
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	494
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	495 class httpbasicauthhandler(urlreq.httpbasicauthhandler):
11844 6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	496 def __init__(self, args, *kwargs):
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	497 self.auth = None
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	498 urlreq.httpbasicauthhandler.__init__(self, args, *kwargs)
11844 6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	499 self.retried_req = None
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	500
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	501 def http_request(self, request):
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	502 if self.auth:
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	503 request.add_unredirected_header(self.auth_header, self.auth)
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	504
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	505 return request
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	506
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	507 def https_request(self, request):
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	508 if self.auth:
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	509 request.add_unredirected_header(self.auth_header, self.auth)
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	510
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	511 return request
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	512
11844 6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	513 def reset_retry_count(self):
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	514 # Python 2.6.5 will call this on 401 or 407 errors and thus loop
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	515 # forever. We disable reset_retry_count completely and reset in
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	516 # http_error_auth_reqed instead.
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	517 pass
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	518
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	519 def http_error_auth_reqed(self, auth_header, host, req, headers):
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	520 # Reset the retry counter once for each request.
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	521 if req is not self.retried_req:
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	522 self.retried_req = req
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	523 self.retried = 0
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	524 return urlreq.httpbasicauthhandler.http_error_auth_reqed(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	525 self, auth_header, host, req, headers
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	526 )
11844 6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	527
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	528 def retry_http_basic_auth(self, host, req, realm):
34467 1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	529 user, pw = self.passwd.find_user_password(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	530 realm, urllibcompat.getfullurl(req)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	531 )
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	532 if pw is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	533 raw = b"%s:%s" % (pycompat.bytesurl(user), pycompat.bytesurl(pw))
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	534 auth = 'Basic %s' % pycompat.strurl(base64.b64encode(raw).strip())
29639 6fd751fa58d3 url: avoid re-issuing incorrect password (issue3210) Kim Randell <Kim.Randell@vicon.com> parents: 29599 diff changeset	535 if req.get_header(self.auth_header, None) == auth:
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	536 return None
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	537 self.auth = auth
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	538 req.add_unredirected_header(self.auth_header, auth)
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	539 return self.parent.open(req)
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	540 else:
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	541 return None
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	542
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	543
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	544 class cookiehandler(urlreq.basehandler):
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	545 def __init__(self, ui):
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	546 self.cookiejar = None
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	547
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	548 cookiefile = ui.config(b'auth', b'cookiefile')
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	549 if not cookiefile:
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	550 return
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	551
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	552 cookiefile = util.expandpath(cookiefile)
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	553 try:
37735 126998dcfb08 url: some bytes/str cleanup where we interface with stdlib funcs Augie Fackler <augie@google.com> parents: 37103 diff changeset	554 cookiejar = util.cookielib.MozillaCookieJar(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	555 pycompat.fsdecode(cookiefile)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	556 )
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	557 cookiejar.load()
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	558 self.cookiejar = cookiejar
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	559 except util.cookielib.LoadError as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	560 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	561 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	562 b'(error loading cookie file %s: %s; continuing without '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	563 b'cookies)\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	564 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	565 % (cookiefile, stringutil.forcebytestr(e))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	566 )
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	567
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	568 def http_request(self, request):
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	569 if self.cookiejar:
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	570 self.cookiejar.add_cookie_header(request)
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	571
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	572 return request
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	573
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	574 def https_request(self, request):
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	575 if self.cookiejar:
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	576 self.cookiejar.add_cookie_header(request)
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	577
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	578 return request
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	579
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	580
9347 d0474b184347 url: add support for custom handlers in extensions Henrik Stuart <hg@hstuart.dk> parents: 9122 diff changeset	581 handlerfuncs = []
d0474b184347 url: add support for custom handlers in extensions Henrik Stuart <hg@hstuart.dk> parents: 9122 diff changeset	582
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	583
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	584 def opener(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	585 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	586 authinfo=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	587 useragent=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	588 loggingfh=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	589 loggingname=b's',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	590 loggingopts=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	591 sendaccept=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	592 ):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45758 diff changeset	593 """
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	594 construct an opener suitable for urllib2
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	595 authinfo will be added to the password manager
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	596
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	597 The opener can be configured to log socket events if the various
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	598 ``logging*`` arguments are specified.
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	599
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	600 ``loggingfh`` denotes a file object to log events to.
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	601 ``loggingname`` denotes the name of the to print when logging.
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	602 ``loggingopts`` is a dict of keyword arguments to pass to the constructed
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	603 ``util.socketobserver`` instance.
37048 a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	604
a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	605 ``sendaccept`` allows controlling whether the ``Accept`` request header
a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	606 is sent. The header is sent by default.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45758 diff changeset	607 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	608 timeout = ui.configwith(float, b'http', b'timeout')
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	609 handlers = []
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	610
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	611 if loggingfh:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	612 handlers.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	613 logginghttphandler(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	614 loggingfh, loggingname, loggingopts or {}, timeout=timeout
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	615 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	616 )
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	617 # We don't yet support HTTPS when logging I/O. If we attempt to open
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	618 # an HTTPS URL, we'll likely fail due to unknown protocol.
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	619
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	620 else:
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	621 handlers.append(httphandler(timeout=timeout))
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	622 if has_https:
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	623 handlers.append(httpshandler(ui, timeout=timeout))
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	624
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	625 handlers.append(proxyhandler(ui))
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	626
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29377 diff changeset	627 passmgr = passwordmgr(ui, ui.httppasswordmgrdb)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	628 if authinfo is not None:
29379 fc777c855d66 largefiles: make cloning not ask two times about password (issue4883) liscju <piotr.listkiewicz@gmail.com> parents: 29378 diff changeset	629 realm, uris, user, passwd = authinfo
fc777c855d66 largefiles: make cloning not ask two times about password (issue4883) liscju <piotr.listkiewicz@gmail.com> parents: 29378 diff changeset	630 saveduser, savedpass = passmgr.find_stored_password(uris[0])
fc777c855d66 largefiles: make cloning not ask two times about password (issue4883) liscju <piotr.listkiewicz@gmail.com> parents: 29378 diff changeset	631 if user != saveduser or passwd:
fc777c855d66 largefiles: make cloning not ask two times about password (issue4883) liscju <piotr.listkiewicz@gmail.com> parents: 29378 diff changeset	632 passmgr.add_password(realm, uris, user, passwd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	633 ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	634 b'http auth: user %s, password %s\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	635 % (user, passwd and b'' len(passwd) or b'not set')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	636 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	637
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	638 handlers.extend(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	639 (httpbasicauthhandler(passmgr), httpdigestauthhandler(passmgr))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	640 )
9347 d0474b184347 url: add support for custom handlers in extensions Henrik Stuart <hg@hstuart.dk> parents: 9122 diff changeset	641 handlers.extend([h(ui, passmgr) for h in handlerfuncs])
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	642 handlers.append(cookiehandler(ui))
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	643 opener = urlreq.buildopener(*handlers)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	644
40035 393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	645 # keepalive.py's handlers will populate these attributes if they exist.
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	646 opener.requestscount = 0
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	647 opener.sentbytescount = 0
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	648 opener.receivedbytescount = 0
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	649
29589 486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	650 # The user agent should should NOT be used by servers for e.g.
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	651 # protocol detection or feature negotiation: there are other
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	652 # facilities for that.
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	653 #
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	654 # "mercurial/proto-1.0" was the original user agent string and
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	655 # exists for backwards compatibility reasons.
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	656 #
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	657 # The "(Mercurial %s)" string contains the distribution
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	658 # name and version. Other client implementations should choose their
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	659 # own distribution name. Since servers should not be using the user
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	660 # agent string for anything, clients should be able to define whatever
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	661 # user agent they deem appropriate.
35443 e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 34694 diff changeset	662 #
e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 34694 diff changeset	663 # The custom user agent is for lfs, because unfortunately some servers
e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 34694 diff changeset	664 # do look at this value.
e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 34694 diff changeset	665 if not useragent:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	666 agent = b'mercurial/proto-1.0 (Mercurial %s)' % util.version()
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	667 opener.addheaders = [('User-agent', pycompat.sysstr(agent))]
35443 e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 34694 diff changeset	668 else:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	669 opener.addheaders = [('User-agent', pycompat.sysstr(useragent))]
30763 a520aefb96f1 httppeer: advertise and support application/mercurial-0.2 Gregory Szorc <gregory.szorc@gmail.com> parents: 30667 diff changeset	670
a520aefb96f1 httppeer: advertise and support application/mercurial-0.2 Gregory Szorc <gregory.szorc@gmail.com> parents: 30667 diff changeset	671 # This header should only be needed by wire protocol requests. But it has
a520aefb96f1 httppeer: advertise and support application/mercurial-0.2 Gregory Szorc <gregory.szorc@gmail.com> parents: 30667 diff changeset	672 # been sent on all requests since forever. We keep sending it for backwards
a520aefb96f1 httppeer: advertise and support application/mercurial-0.2 Gregory Szorc <gregory.szorc@gmail.com> parents: 30667 diff changeset	673 # compatibility reasons. Modern versions of the wire protocol use
a520aefb96f1 httppeer: advertise and support application/mercurial-0.2 Gregory Szorc <gregory.szorc@gmail.com> parents: 30667 diff changeset	674 # X-HgProto-<N> for advertising client support.
37048 a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	675 if sendaccept:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	676 opener.addheaders.append(('Accept', 'application/mercurial-0.1'))
37048 a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	677
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	678 return opener
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	679
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	680
42109 2a3c0106ded9 import: suppress accept: header timeless <timeless@mozdev.org> parents: 41722 diff changeset	681 def open(ui, url_, data=None, sendaccept=True):
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	682 u = urlutil.url(url_)
13818 bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	683 if u.scheme:
bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	684 u.scheme = u.scheme.lower()
bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	685 url_, authinfo = u.authinfo()
bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	686 else:
47630 8e5192e41e0b windows: use abspath in url Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46907 diff changeset	687 path = util.normpath(util.abspath(url_))
44645 e74af49aa3c9 url: pass str to pathname2url Gregory Szorc <gregory.szorc@gmail.com> parents: 44470 diff changeset	688 url_ = b'file://' + pycompat.bytesurl(
e74af49aa3c9 url: pass str to pathname2url Gregory Szorc <gregory.szorc@gmail.com> parents: 44470 diff changeset	689 urlreq.pathname2url(pycompat.fsdecode(path))
e74af49aa3c9 url: pass str to pathname2url Gregory Szorc <gregory.szorc@gmail.com> parents: 44470 diff changeset	690 )
7284 ac81ffac0f35 url: fix file:// URL handling Patrick Mezard <pmezard@gmail.com> parents: 7270 diff changeset	691 authinfo = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	692 return opener(ui, authinfo, sendaccept=sendaccept).open(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	693 pycompat.strurl(url_), data
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	694 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	695
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	696
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	697 def wrapresponse(resp):
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	698 """Wrap a response object with common error handlers.
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	699
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	700 This ensures that any I/O from any consumer raises the appropriate
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	701 error and messaging.
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	702 """
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	703 origread = resp.read
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	704
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	705 class readerproxy(resp.__class__):
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	706 def read(self, size=None):
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	707 try:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	708 return origread(size)
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	709 except httplib.IncompleteRead as e:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	710 # e.expected is an integer if length known or None otherwise.
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	711 if e.expected:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	712 got = len(e.partial)
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	713 total = e.expected + got
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	714 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 b'HTTP request error (incomplete response; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	716 b'expected %d bytes got %d)'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	717 ) % (total, got)
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	718 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	719 msg = _(b'HTTP request error (incomplete response)')
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	720
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	721 raise error.PeerTransportError(
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	722 msg,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	723 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	724 b'this may be an intermittent network failure; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	725 b'if the error persists, consider contacting the '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	726 b'network or server operator'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	727 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	728 )
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	729 except httplib.HTTPException as e:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	730 raise error.PeerTransportError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	731 _(b'HTTP request error (%s)') % e,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	732 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	733 b'this may be an intermittent network failure; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	734 b'if the error persists, consider contacting the '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	735 b'network or server operator'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	736 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	737 )
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	738
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	739 resp.__class__ = readerproxy

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/url.py @ 47682:78f7f0d490ee