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.

     1

from __future__ import absolute_import, print_function

     2

import os

     3

from mercurial import (

     4

    dispatch,

     5

)

     6

     7

def testdispatch(cmd):

     8

    """Simple wrapper around dispatch.dispatch()

     9

    10

    Prints command and result value, but does not handle quoting.

    11

    """

    12

    print("running: %s" % (cmd,))

    13

    req = dispatch.request(cmd.split())

    14

    result = dispatch.dispatch(req)

    15

    print("result: %r" % (result,))

    16

    17

testdispatch("init test1")

    18

os.chdir('test1')

    19

    20

# create file 'foo', add and commit

    21

f = open('foo', 'wb')

    22

f.write('foo\n')

    23

f.close()

    24

testdispatch("add foo")

    25

testdispatch("commit -m commit1 -d 2000-01-01 foo")

    26

    27

# append to file 'foo' and commit

    28

f = open('foo', 'ab')

    29

f.write('bar\n')

    30

f.close()

    31

testdispatch("commit -m commit2 -d 2000-01-02 foo")

    32

    33

# check 88803a69b24 (fancyopts modified command table)

    34

testdispatch("log -r 0")

    35

testdispatch("log -r tip")