mercurial-scm/hg-stable: mercurial/httpclient/socketutil.py annotate

annotate mercurial/httpclient/socketutil.py @ 27601:1ad9da968a2e

httpclient: update to 938f2107d6e2 of httpplus This enhances proxy support in httpclient a little bit, though I don't know that we used that functionality at all. It also switches httpplus to using absolute_import.

author	Augie Fackler <augie@google.com>
date	Thu, 31 Dec 2015 13:19:20 -0500
parents	328739ea70c3
children	8a66eda46c98

rev	line source
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	1 # Copyright 2010, Google Inc.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	2 # All rights reserved.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 #
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	4 # Redistribution and use in source and binary forms, with or without
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 # modification, are permitted provided that the following conditions are
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 # met:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 #
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 # * Redistributions of source code must retain the above copyright
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 # notice, this list of conditions and the following disclaimer.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 # * Redistributions in binary form must reproduce the above
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	11 # copyright notice, this list of conditions and the following disclaimer
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	12 # in the documentation and/or other materials provided with the
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 # distribution.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	14 # * Neither the name of Google Inc. nor the names of its
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	15 # contributors may be used to endorse or promote products derived from
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	16 # this software without specific prior written permission.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	17
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	18 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	19 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	20 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	21 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	29 """Abstraction to simplify socket use for Python < 2.6
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	30
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	31 This will attempt to use the ssl module and the new
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	32 socket.create_connection method, but fall back to the old
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	33 methods if those are unavailable.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	34 """
27601 1ad9da968a2e httpclient: update to 938f2107d6e2 of httpplus Augie Fackler <augie@google.com> parents: 25660 diff changeset	35 from __future__ import absolute_import
1ad9da968a2e httpclient: update to 938f2107d6e2 of httpplus Augie Fackler <augie@google.com> parents: 25660 diff changeset	36
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	37 import logging
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	38 import socket
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	39
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	40 logger = logging.getLogger(__name__)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	41
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	42 try:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	43 import ssl
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	44 # make demandimporters load the module
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	45 ssl.wrap_socket # pylint: disable=W0104
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	46 have_ssl = True
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	47 except ImportError:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	48 import httplib
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	49 import urllib2
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	50 have_ssl = getattr(urllib2, 'HTTPSHandler', False)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	51 ssl = False
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	52
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	53
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	54 try:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	55 create_connection = socket.create_connection
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	56 except AttributeError:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	57 def create_connection(address):
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	58 """Backport of socket.create_connection from Python 2.6."""
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	59 host, port = address
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	60 msg = "getaddrinfo returns an empty list"
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	61 sock = None
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	62 for res in socket.getaddrinfo(host, port, 0,
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	63 socket.SOCK_STREAM):
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	64 af, socktype, proto, unused_canonname, sa = res
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	65 try:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	66 sock = socket.socket(af, socktype, proto)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	67 logger.info("connect: (%s, %s)", host, port)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	68 sock.connect(sa)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 19748 diff changeset	69 except socket.error as msg:
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	70 logger.info('connect fail: %s %s', host, port)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	71 if sock:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	72 sock.close()
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	73 sock = None
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	74 continue
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	75 break
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	76 if not sock:
18179 f614543733b6 httpclient: apply change df9aea1def3e: remove use of two-argument raise Augie Fackler <raf@durin42.com> parents: 14990 diff changeset	77 raise socket.error(msg)
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	78 return sock
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	79
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	80 if ssl:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	81 wrap_socket = ssl.wrap_socket
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	82 CERT_NONE = ssl.CERT_NONE
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	83 CERT_OPTIONAL = ssl.CERT_OPTIONAL
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	84 CERT_REQUIRED = ssl.CERT_REQUIRED
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	85 else:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	86 class FakeSocket(httplib.FakeSocket):
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	87 """Socket wrapper that supports SSL."""
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	88
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	89 # Silence lint about this goofy backport class
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	90 # pylint: disable=W0232,E1101,R0903,R0913,C0111
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	91
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	92 # backport the behavior from Python 2.6, which is to busy wait
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	93 # on the socket instead of anything nice. Sigh.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	94 # See http://bugs.python.org/issue3890 for more info.
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	95 def recv(self, buflen=1024, flags=0):
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	96 """ssl-aware wrapper around socket.recv
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	97 """
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	98 if flags != 0:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	99 raise ValueError(
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	100 "non-zero flags not allowed in calls to recv() on %s" %
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	101 self.__class__)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	102 while True:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	103 try:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	104 return self._ssl.read(buflen)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 19748 diff changeset	105 except socket.sslerror as x:
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	106 if x.args[0] == socket.SSL_ERROR_WANT_READ:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	107 continue
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	108 else:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	109 raise x
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	110
19748 59df9e52b5bb httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038) Augie Fackler <raf@durin42.com> parents: 19489 diff changeset	111 _PROTOCOL_SSLv23 = 2
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	112
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	113 CERT_NONE = 0
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	114 CERT_OPTIONAL = 1
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	115 CERT_REQUIRED = 2
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	116
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	117 # Disable unused-argument because we're making a dumb wrapper
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	118 # that's like an upstream method.
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	119 #
fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	120 # pylint: disable=W0613,R0913
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	121 def wrap_socket(sock, keyfile=None, certfile=None,
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	122 server_side=False, cert_reqs=CERT_NONE,
19748 59df9e52b5bb httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038) Augie Fackler <raf@durin42.com> parents: 19489 diff changeset	123 ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	124 do_handshake_on_connect=True,
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	125 suppress_ragged_eofs=True):
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	126 """Backport of ssl.wrap_socket from Python 2.6."""
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	127 if cert_reqs != CERT_NONE and ca_certs:
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	128 raise CertificateValidationUnsupported(
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	129 'SSL certificate validation requires the ssl module'
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	130 '(included in Python 2.6 and later.)')
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	131 sslob = socket.ssl(sock)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	132 # borrow httplib's workaround for no ssl.wrap_socket
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	133 sock = FakeSocket(sock, sslob)
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	134 return sock
19182 fae47ecaa952 httpclient: upgrade to fe8c09e4db64 of httpplus Augie Fackler <raf@durin42.com> parents: 18179 diff changeset	135 # pylint: enable=W0613,R0913
14243 861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	136
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	137
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	138 class CertificateValidationUnsupported(Exception):
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	139 """Exception raised when cert validation is requested but unavailable."""
861f28212398 Import new http library as mercurial.httpclient. Augie Fackler <durin42@gmail.com> parents: diff changeset	140 # no-check-code

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/httpclient/socketutil.py @ 27601:1ad9da968a2e