Mercurial > hg
view mercurial/pycompat.py @ 29452:26a5d605b868 stable 3.8.4
sslutil: synchronize hostname matching logic with CPython
sslutil contains its own hostname matching logic. CPython has code
for the same intent. However, it is only available to Python 2.7.9+
(or distributions that have backported 2.7.9's ssl module
improvements).
This patch effectively imports CPython's hostname matching code
from its ssl.py into sslutil.py. The hostname matching code itself
is pretty similar. However, the DNS name matching code is much more
robust and spec conformant.
As the test changes show, this changes some behavior around
wildcard handling and IDNA matching. The new behavior allows
wildcards in the middle of words (e.g. 'f*.com' matches 'foo.com')
This is spec compliant according to RFC 6125 Section 6.5.3 item 3.
There is one test where the matcher is more strict. Before,
'*.a.com' matched '.a.com'. Now it doesn't match. Strictly speaking
this is a security vulnerability.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 26 Jun 2016 19:34:48 -0700 |
parents | 800ec7c048b0 |
children | b501579147f1 |
line wrap: on
line source
# pycompat.py - portability shim for python 3 # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """Mercurial portability shim for python 3. This contains aliases to hide python version-specific details from the core. """ from __future__ import absolute_import try: import cStringIO as io stringio = io.StringIO except ImportError: import io stringio = io.StringIO try: import Queue as _queue _queue.Queue except ImportError: import queue as _queue empty = _queue.Empty queue = _queue.Queue class _pycompatstub(object): pass def _alias(alias, origin, items): """ populate a _pycompatstub copies items from origin to alias """ def hgcase(item): return item.replace('_', '').lower() for item in items: try: setattr(alias, hgcase(item), getattr(origin, item)) except AttributeError: pass urlreq = _pycompatstub() urlerr = _pycompatstub() try: import urllib2 import urllib _alias(urlreq, urllib, ( "addclosehook", "addinfourl", "ftpwrapper", "pathname2url", "quote", "splitattr", "splitpasswd", "splitport", "splituser", "unquote", "url2pathname", "urlencode", "urlencode", )) _alias(urlreq, urllib2, ( "AbstractHTTPHandler", "BaseHandler", "build_opener", "FileHandler", "FTPHandler", "HTTPBasicAuthHandler", "HTTPDigestAuthHandler", "HTTPHandler", "HTTPPasswordMgrWithDefaultRealm", "HTTPSHandler", "install_opener", "ProxyHandler", "Request", "urlopen", )) _alias(urlerr, urllib2, ( "HTTPError", "URLError", )) except ImportError: import urllib.request _alias(urlreq, urllib.request, ( "AbstractHTTPHandler", "addclosehook", "addinfourl", "BaseHandler", "build_opener", "FileHandler", "FTPHandler", "ftpwrapper", "HTTPHandler", "HTTPSHandler", "install_opener", "pathname2url", "HTTPBasicAuthHandler", "HTTPDigestAuthHandler", "ProxyHandler", "quote", "Request", "splitattr", "splitpasswd", "splitport", "splituser", "unquote", "url2pathname", "urlopen", )) import urllib.error _alias(urlerr, urllib.error, ( "HTTPError", "URLError", )) try: xrange except NameError: import builtins builtins.xrange = range