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

annotate mercurial/url.py @ 48966:6000f5b25c9b

py2: remove simple from __future__ statements These were needed for Python 2 support. Now that our linter no longer mandates these, we can start deleting them. Differential Revision: https://phab.mercurial-scm.org/D12254

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 03 Mar 2022 17:34:00 +0100
parents	8e5192e41e0b
children	127cc4535853

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
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	11 import base64
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	12 import socket
37103 9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	13 import sys
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	14
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	15 from .i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	16 from .pycompat import getattr
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	17 from . import (
30820 6a70cf94d1b5 py3: replace pycompat.getenv with encoding.environ.get Pulkit Goyal <7895pulkit@gmail.com> parents: 30763 diff changeset	18 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 25990 diff changeset	19 error,
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	20 httpconnection as httpconnectionmod,
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	21 keepalive,
34429 0ee9cf8d054a url: use native strings for header values Augie Fackler <augie@google.com> parents: 33499 diff changeset	22 pycompat,
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	23 sslutil,
34467 1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	24 urllibcompat,
25990 c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	25 util,
c3efcdba08ea url: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25837 diff changeset	26 )
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	27 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	28 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	29 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	30 )
29455 0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29379 diff changeset	31
0c741fd6158a py3: conditionalize httplib import Pulkit Goyal <7895pulkit@gmail.com> parents: 29379 diff changeset	32 httplib = util.httplib
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 26806 diff changeset	33 stringio = util.stringio
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	34 urlerr = util.urlerr
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	35 urlreq = util.urlreq
032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	36
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	37
34694 2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	38 def escape(s, quote=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45758 diff changeset	39 """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	40 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	41 is also translated.
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	42
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	43 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	44 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	45 """
34694 2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	46 s = s.replace(b"&", b"&")
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 if quote:
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	50 s = s.replace(b'"', b""")
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	51 return s
2976cf87a60a url: add cgi.escape equivalent for bytestrings Augie Fackler <augie@google.com> parents: 34467 diff changeset	52
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	53
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	54 class passwordmgr(object):
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	55 def __init__(self, ui, passwddb):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	56 self.ui = ui
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	57 self.passwddb = passwddb
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	58
2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	59 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	60 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	61
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	62 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	63 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	64 assert isinstance(authuri, str)
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	65 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	66 user, passwd = authinfo
41470 d437d1e2a711 url: convert some variables back to bytes Augie Fackler <augie@google.com> parents: 41469 diff changeset	67 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	68 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	69 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	70 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	71
15005 4a43e23b8c55 hgweb: do not ignore [auth] if url has a username (issue2822) Patrick Mezard <pmezard@gmail.com> parents: 14244 diff changeset	72 if not user or not passwd:
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	73 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	74 if res:
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	75 group, auth = res
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	76 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	77 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	78 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	79 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	80 u.query = None
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	81 if not self.ui.interactive():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	82 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	83 _(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	84 % urlutil.hidepassword(bytes(u))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	85 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	86
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	87 self.ui.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	88 _(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	89 % urlutil.hidepassword(bytes(u))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	90 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	91 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	92 if user:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	93 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	94 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	95 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	96
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	97 if not passwd:
89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	98 passwd = self.ui.getpass()
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	99
45758 ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	100 # 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	101 # 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	102 # 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	103 # 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	104 if user is None:
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	105 return None, None
ff48eea4a926 url: do not continue HTTP authentication with user=None (issue6425) Yuya Nishihara <yuya@tcha.org> parents: 44766 diff changeset	106
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	107 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	108 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	109 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	110
8333 89c80c3dc584 allow http authentication information to be specified in the configuration Sune Foldager <cryo@cyanite.org> parents: 8225 diff changeset	111 def _writedebug(self, user, passwd):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	112 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	113 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	114
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	115 def find_stored_password(self, authuri):
29377 2c019aac6b99 url: extract password database from password manager liscju <piotr.listkiewicz@gmail.com> parents: 29252 diff changeset	116 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	117
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	118
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	119 class proxyhandler(urlreq.proxyhandler):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	120 def __init__(self, ui):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	121 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	122 b'http_proxy'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	123 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	124 # XXX proxyauthinfo = None
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	125
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	126 if proxyurl:
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	127 # proxy can be proper url or host[:port]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	128 if not (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	129 proxyurl.startswith(b'http:') or proxyurl.startswith(b'https:')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	130 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	131 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	132 proxy = urlutil.url(proxyurl)
13820 65b89e80f892 url: use url.url in proxyhandler Brodie Rao <brodie@bitheap.org> parents: 13819 diff changeset	133 if not proxy.user:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	134 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	135 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	136
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	137 # 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	138 no_list = [b"localhost", b"127.0.0.1"]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	139 no_list.extend(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	140 [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	141 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	142 no_list.extend(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	143 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	144 p.strip().lower()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	145 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	146 if p.strip()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	147 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	148 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	149 # "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	150 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	151 self.no_list = []
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	152 else:
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	153 self.no_list = no_list
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	154
41721 4028897dfa05 url: always use str for proxy configuration Gregory Szorc <gregory.szorc@gmail.com> parents: 41719 diff changeset	155 # 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	156 # expects them to be.
4028897dfa05 url: always use str for proxy configuration Gregory Szorc <gregory.szorc@gmail.com> parents: 41719 diff changeset	157 proxyurl = str(proxy)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	158 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	159 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	160 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	161 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	162 else:
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	163 proxies = {}
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	164
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	165 urlreq.proxyhandler.__init__(self, proxies)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	166 self.ui = ui
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	167
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	168 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	169 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	170 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	171 if host == e:
df2155ebf502 proxy: allow wildcards in the no proxy list (issue1821) Matt Mackall <mpm@selenic.com> parents: 18176 diff changeset	172 return None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	173 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	174 return None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	175 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	176 return None
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	177
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	178 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	179
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	180
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	181 def _gen_sendfile(orgsend):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	182 def _sendfile(self, data):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	183 # send a file
14244 e7525a555a64 url: use new http support if requested by the user Augie Fackler <durin42@gmail.com> parents: 14204 diff changeset	184 if isinstance(data, httpconnectionmod.httpsendfile):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	185 # 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	186 data.seek(0)
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	187 for chunk in util.filechunkiter(data):
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	188 orgsend(self, chunk)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	189 else:
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	190 orgsend(self, data)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	191
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	192 return _sendfile
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	193
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	194
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	195 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	196
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	197
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	198 class httpconnection(keepalive.HTTPConnection):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	199 # must be able to send big bundle as stream.
13420 051f498628f7 url: refactor _gen_sendfile Mads Kiilerich <mads@kiilerich.com> parents: 13419 diff changeset	200 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	201
8590 59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	202 def getresponse(self):
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	203 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	204 if proxyres:
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	205 if proxyres.will_close:
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	206 self.close()
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	207 self.proxyres = None
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	208 return proxyres
59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	209 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	210
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	211
41719 d20f1594ff4a url: always access req._tunnel_host Gregory Szorc <gregory.szorc@gmail.com> parents: 41603 diff changeset	212 # 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	213 # 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	214 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	215 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	216 if tunnel_host:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	217 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	218 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	219 new_tunnel = True
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	220 else:
34467 1232f7fa00c3 cleanup: use urllibcompat for renamed methods on urllib request objects Augie Fackler <augie@google.com> parents: 34429 diff changeset	221 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	222 new_tunnel = False
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	223
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	224 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	225 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	226 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	227 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	228 h.headers = req.headers.copy()
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	229 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	230 return
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	231
10415 677f15da38c1 url: proxy handling, simplify and correctly deal with IPv6 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10411 diff changeset	232 h.realhostport = None
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	233 h.headers = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	234
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	235
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	236 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	237 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	238 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	239 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	240 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	241 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	242 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	243 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	244 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	245 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	246
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	247 # 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	248 # 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	249 # 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	250 # 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	251 kwargs = {}
544035846830 url: don't pass strict argument on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 41721 diff changeset	252 if not pycompat.ispy3:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	253 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	254
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	255 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	256
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	257 while True:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	258 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	259 if status != httplib.CONTINUE:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	260 break
29741 44ea12756fef url: use `iter(callable, sentinel)` instead of while True Augie Fackler <augie@google.com> parents: 29682 diff changeset	261 # 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	262 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	263 res.status = status
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	264 res.reason = reason.strip()
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	265
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	266 if res.status == 200:
29741 44ea12756fef url: use `iter(callable, sentinel)` instead of while True Augie Fackler <augie@google.com> parents: 29682 diff changeset	267 # 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	268 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	269 return True
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	270
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	271 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	272 res.version = 10
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	273 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	274 res.version = 11
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	275 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	276 res.version = 9
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	277 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	278 raise httplib.UnknownProtocol(version)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	279
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	280 if res.version == 9:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	281 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	282 res.chunked = 0
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	283 res.will_close = 1
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 26806 diff changeset	284 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	285 return False
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	286
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	287 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	288 res.msg.fp = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	289
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	290 # 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	291 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	292 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	293 res.chunked = 1
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	294 res.chunk_left = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	295 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	296 res.chunked = 0
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	297
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	298 # 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	299 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	300
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	301 # 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	302 # 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	303 # transfer-encoding is "chunked"
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	304 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	305 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	306 try:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	307 res.length = int(length)
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	308 except ValueError:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	309 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	310 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	311 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	312 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	313 else:
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	314 res.length = None
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	315
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	316 # does the body have a fixed length? (of zero)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	317 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	318 status == httplib.NO_CONTENT
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	319 or status == httplib.NOT_MODIFIED
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	320 or 100 <= status < 200
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	321 or res._method == b'HEAD' # 1xx codes
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	322 ):
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	323 res.length = 0
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	324
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	325 # 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	326 # 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	327 # WILL close.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	328 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	329 res.will_close = 1
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	330
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	331 self.proxyres = res
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	332
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	333 return False
917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	334
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	335
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	336 class httphandler(keepalive.HTTPHandler):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	337 def http_open(self, req):
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	338 return self.do_open(httpconnection, req)
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	339
8590 59acb9c7d90f url: use CONNECT for HTTPS connections through HTTP proxy (issue967) Henrik Stuart <hg@hstuart.dk> parents: 8344 diff changeset	340 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	341 _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	342 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	343
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	344
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	345 class logginghttpconnection(keepalive.HTTPConnection):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	346 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	347 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	348 self._create_connection = createconn
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	349
37103 9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	350 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	351 # 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	352 # socket.create_connection()
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	353 def connect(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	354 self.sock = self._create_connection(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	355 (self.host, self.port), self.timeout, self.source_address
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	356 )
37103 9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	357 if self._tunnel_host:
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	358 self._tunnel()
9e6d3465f17e url: make logginghttphandler compatible with Python 2.7.6 Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	359
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	360
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	361 class logginghttphandler(httphandler):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	362 """HTTP handler that logs socket I/O."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	363
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	364 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	365 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	366
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	367 self._logfh = logfh
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	368 self._logname = name
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	369 self._observeropts = observeropts
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	370
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	371 # 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	372 # 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	373 # 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	374 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	375 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	376
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	377 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	378 def createconnection(args, *kwargs):
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	379 sock = socket.create_connection(args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	380 return util.makeloggingsocket(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	381 self._logfh, sock, self._logname, **self._observeropts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	382 )
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	383
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	384 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	385
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	386
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	387 if has_https:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	388
40032 f2dffa1359c6 url: have httpsconnection inherit from our custom HTTPConnection Gregory Szorc <gregory.szorc@gmail.com> parents: 40019 diff changeset	389 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	390 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	391 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	392 # 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	393 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	394 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	395
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	396 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	397 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	398 host,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	399 port=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	400 key_file=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	401 cert_file=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	402 *args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	403 **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	404 ):
40032 f2dffa1359c6 url: have httpsconnection inherit from our custom HTTPConnection Gregory Szorc <gregory.szorc@gmail.com> parents: 40019 diff changeset	405 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	406 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	407 self.cert_file = cert_file
9726 430e59ff3437 keepalive: handle broken pipes gracefully during large POSTs Augie Fackler <durin42@gmail.com> parents: 9467 diff changeset	408
10409 4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	409 def connect(self):
29682 b76ea1384bf2 url: drop compatibility wrapper of socket.create_connection() Yuya Nishihara <yuya@tcha.org> parents: 29639 diff changeset	410 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	411
13421 bd8bfa85d5a5 url: refactor BetterHTTPS.connect Mads Kiilerich <mads@kiilerich.com> parents: 13420 diff changeset	412 host = self.host
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	413 if self.realhostport: # use CONNECT proxy
14064 e4bfb9c337f3 remove unused imports and variables Alexander Solovyov <alexander@solovyov.net> parents: 13902 diff changeset	414 _generic_proxytunnel(self)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	415 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	416 self.sock = sslutil.wrapsocket(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	417 self.sock,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	418 self.key_file,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	419 self.cert_file,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	420 ui=self.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	421 serverhostname=host,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	422 )
29227 dffe78d80a6c sslutil: convert socket validation from a class to a function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 28883 diff changeset	423 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	424
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	425 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	426 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	427 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	428 urlreq.httpshandler.__init__(self)
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	429 self.ui = ui
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	430 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	431
9852 917cf6bb6d0c url: generalise HTTPS proxy handling to accomodate Python changes Henrik Stuart <hg@hstuart.dk> parents: 9726 diff changeset	432 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	433 _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	434 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	435
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	436 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	437 # 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	438 # 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	439 url = urllibcompat.getfullurl(req)
15025 0593e8f81c71 http: pass user to readauthforuri() (fix 4a43e23b8c55) Patrick Mezard <pmezard@gmail.com> parents: 15005 diff changeset	440 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	441 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	442 if res:
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	443 group, auth = res
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	444 self.auth = auth
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	445 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	446 else:
5bced0d28a39 url: return the matched authentication group name from readauthforuri() Steve Borho <steve@borho.org> parents: 13371 diff changeset	447 self.auth = None
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	448 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	449
10408 50fb1fe143ff url: httplib.HTTPSConnection already handles IPv6 and port parsing fine Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	450 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	451 keyfile = None
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	452 certfile = None
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	453
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	454 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	455 keyfile = args[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	456 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	457 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	458 args = args[2:]
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	459
7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	460 # 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	461 # hgrc, we prefer these
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	462 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	463 keyfile = self.auth[b'key']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	464 certfile = self.auth[b'cert']
8847 7951f385fcb7 url: support client certificate files over HTTPS (issue643) Henrik Stuart <hg@hstuart.dk> parents: 8590 diff changeset	465
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	466 conn = httpsconnection(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	467 host, port, keyfile, certfile, args, *kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	468 )
10409 4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	469 conn.ui = self.ui
4c94a3df4b10 url: SSL server certificate verification using web.cacerts file (issue1174) Henrik Stuart <hg@hstuart.dk> parents: 10408 diff changeset	470 return conn
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	471
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	472
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	473 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	474 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	475 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	476 self.retried_req = None
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	477
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	478 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	479 # 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	480 # 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	481 # 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	482 pass
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	483
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	484 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	485 # 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	486 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	487 self.retried_req = req
2ec346160783 http digest auth: reset redirect counter on new requests (issue2255) Mads Kiilerich <mads@kiilerich.com> parents: 11415 diff changeset	488 self.retried = 0
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	489 return urlreq.httpdigestauthhandler.http_error_auth_reqed(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	490 self, auth_header, host, req, headers
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	491 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	492
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	493
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	494 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	495 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	496 self.auth = None
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	497 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	498 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	499
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	500 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	501 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	502 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	503
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	504 return request
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	505
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	506 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	507 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	508 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	509
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	510 return request
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	511
11844 6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	512 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	513 # 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	514 # 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	515 # 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	516 pass
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	517
6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	518 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	519 # 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	520 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	521 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	522 self.retried = 0
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	523 return urlreq.httpbasicauthhandler.http_error_auth_reqed(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	524 self, auth_header, host, req, headers
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	525 )
11844 6c51a5056020 http basic auth: reset redirect counter on new requests (issue2255) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 11457 diff changeset	526
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	527 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	528 user, pw = self.passwd.find_user_password(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	529 realm, urllibcompat.getfullurl(req)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	530 )
20964 a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	531 if pw is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	532 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	533 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	534 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	535 return None
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	536 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	537 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	538 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	539 else:
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	540 return None
a939eeb94833 http: reuse authentication info after the first failed request (issue3567) St?phane Klein <contact@stephane-klein.info> parents: 20291 diff changeset	541
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	542
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	543 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	544 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	545 self.cookiejar = None
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	546
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	547 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	548 if not cookiefile:
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	549 return
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	550
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	551 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	552 try:
37735 126998dcfb08 url: some bytes/str cleanup where we interface with stdlib funcs Augie Fackler <augie@google.com> parents: 37103 diff changeset	553 cookiejar = util.cookielib.MozillaCookieJar(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	554 pycompat.fsdecode(cookiefile)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	555 )
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	556 cookiejar.load()
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	557 self.cookiejar = cookiejar
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	558 except util.cookielib.LoadError as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	559 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	560 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	561 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	562 b'cookies)\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	563 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	564 % (cookiefile, stringutil.forcebytestr(e))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	565 )
31936 806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	566
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	567 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	568 if self.cookiejar:
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	569 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	570
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	571 return request
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	572
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	573 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	574 if self.cookiejar:
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	575 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	576
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	577 return request
806f9a883b4f url: support auth.cookiesfile for adding cookies to HTTP requests Gregory Szorc <gregory.szorc@gmail.com> parents: 30820 diff changeset	578
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	579
9347 d0474b184347 url: add support for custom handlers in extensions Henrik Stuart <hg@hstuart.dk> parents: 9122 diff changeset	580 handlerfuncs = []
d0474b184347 url: add support for custom handlers in extensions Henrik Stuart <hg@hstuart.dk> parents: 9122 diff changeset	581
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	582
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	583 def opener(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	584 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	585 authinfo=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	586 useragent=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	587 loggingfh=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	588 loggingname=b's',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	589 loggingopts=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	590 sendaccept=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	591 ):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45758 diff changeset	592 """
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	593 construct an opener suitable for urllib2
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	594 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	595
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	596 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	597 ``logging*`` arguments are specified.
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	598
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	599 ``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	600 ``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	601 ``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	602 ``util.socketobserver`` instance.
37048 a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	603
a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	604 ``sendaccept`` allows controlling whether the ``Accept`` request header
a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	605 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	606 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	607 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	608 handlers = []
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	609
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	610 if loggingfh:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	611 handlers.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	612 logginghttphandler(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	613 loggingfh, loggingname, loggingopts or {}, timeout=timeout
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	614 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	615 )
37014 02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	616 # 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	617 # 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	618
02221d6fb041 url: add HTTP handler that uses a proxied socket Gregory Szorc <gregory.szorc@gmail.com> parents: 36681 diff changeset	619 else:
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	620 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	621 if has_https:
40044 6509fcec830c url: allow to configure timeout on http connection C?dric Krier <ced@b2ck.com> parents: 40035 diff changeset	622 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	623
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	624 handlers.append(proxyhandler(ui))
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	625
29378 fea71f66ebff url: remember http password database in ui object liscju <piotr.listkiewicz@gmail.com> parents: 29377 diff changeset	626 passmgr = passwordmgr(ui, ui.httppasswordmgrdb)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	627 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	628 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	629 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	630 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	631 passmgr.add_password(realm, uris, user, passwd)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	632 ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	633 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	634 % (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	635 )
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	636
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	637 handlers.extend(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	638 (httpbasicauthhandler(passmgr), httpdigestauthhandler(passmgr))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	639 )
9347 d0474b184347 url: add support for custom handlers in extensions Henrik Stuart <hg@hstuart.dk> parents: 9122 diff changeset	640 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	641 handlers.append(cookiehandler(ui))
28883 032c4c2f802a pycompat: switch to util.urlreq/util.urlerr for py3 compat timeless <timeless@mozdev.org> parents: 28861 diff changeset	642 opener = urlreq.buildopener(*handlers)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	643
40035 393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	644 # 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	645 opener.requestscount = 0
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	646 opener.sentbytescount = 0
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	647 opener.receivedbytescount = 0
393e44324037 httppeer: report http statistics Gregory Szorc <gregory.szorc@gmail.com> parents: 40032 diff changeset	648
29589 486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	649 # 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	650 # 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	651 # 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	652 #
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	653 # "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	654 # 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	655 #
486de14eb394 url: add distribution and version to user-agent request header (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29455 diff changeset	656 # 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	657 # 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	658 # 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	659 # 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	660 # 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	661 #
e7bb5fc4570c lfs: add git to the User-Agent header for blob transfers Matt Harbison <matt_harbison@yahoo.com> parents: 34694 diff changeset	662 # 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	663 # 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	664 if not useragent:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	665 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	666 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	667 else:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	668 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	669
a520aefb96f1 httppeer: advertise and support application/mercurial-0.2 Gregory Szorc <gregory.szorc@gmail.com> parents: 30667 diff changeset	670 # 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	671 # 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	672 # 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	673 # X-HgProto-<N> for advertising client support.
37048 a708e1e4d7a8 url: support suppressing Accept header Gregory Szorc <gregory.szorc@gmail.com> parents: 37014 diff changeset	674 if sendaccept:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43106 diff changeset	675 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	676
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	677 return opener
2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	678
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	679
42109 2a3c0106ded9 import: suppress accept: header timeless <timeless@mozdev.org> parents: 41722 diff changeset	680 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	681 u = urlutil.url(url_)
13818 bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	682 if u.scheme:
bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	683 u.scheme = u.scheme.lower()
bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	684 url_, authinfo = u.authinfo()
bf6156bab41b url: use url.url in url.open() Brodie Rao <brodie@bitheap.org> parents: 13817 diff changeset	685 else:
47630 8e5192e41e0b windows: use abspath in url Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46907 diff changeset	686 path = util.normpath(util.abspath(url_))
44645 e74af49aa3c9 url: pass str to pathname2url Gregory Szorc <gregory.szorc@gmail.com> parents: 44470 diff changeset	687 url_ = b'file://' + pycompat.bytesurl(
e74af49aa3c9 url: pass str to pathname2url Gregory Szorc <gregory.szorc@gmail.com> parents: 44470 diff changeset	688 urlreq.pathname2url(pycompat.fsdecode(path))
e74af49aa3c9 url: pass str to pathname2url Gregory Szorc <gregory.szorc@gmail.com> parents: 44470 diff changeset	689 )
7284 ac81ffac0f35 url: fix file:// URL handling Patrick Mezard <pmezard@gmail.com> parents: 7270 diff changeset	690 authinfo = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	691 return opener(ui, authinfo, sendaccept=sendaccept).open(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	692 pycompat.strurl(url_), data
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	693 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	694
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	695
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	696 def wrapresponse(resp):
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	697 """Wrap a response object with common error handlers.
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	698
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	699 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	700 error and messaging.
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	701 """
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	702 origread = resp.read
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	703
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	704 class readerproxy(resp.__class__):
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	705 def read(self, size=None):
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	706 try:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	707 return origread(size)
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	708 except httplib.IncompleteRead as e:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	709 # 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	710 if e.expected:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	711 got = len(e.partial)
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	712 total = e.expected + got
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	713 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	714 b'HTTP request error (incomplete response; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 b'expected %d bytes got %d)'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	716 ) % (total, got)
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	717 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	718 msg = _(b'HTTP request error (incomplete response)')
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	719
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	720 raise error.PeerTransportError(
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	721 msg,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	722 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	723 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	724 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	725 b'network or server operator'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	726 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	727 )
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	728 except httplib.HTTPException as e:
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	729 raise error.PeerTransportError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	730 _(b'HTTP request error (%s)') % e,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	731 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	732 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	733 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	734 b'network or server operator'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	735 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42109 diff changeset	736 )
40019 f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	737
f80db6adabbe url: move _wraphttpresponse() from httpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 37735 diff changeset	738 resp.__class__ = readerproxy

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/url.py @ 48966:6000f5b25c9b