upstream/mercurial-mirror Files · mercurial/pycompat.py

sslutil: synchronize hostname matching logic with CPython...

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.

Pulkit Goyal - - Load All Authors

File last commit:

r29433:33770d2b default


                r29452:26a5d605

3.8.4 stable

Download file

             pycompat.py
        
                    123 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pycompat.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# 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