##// END OF EJS Templates
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.

File last commit:

r28777:778d947f default
r29452:26a5d605 3.8.4 stable
Show More
test-walkrepo.py
66 lines | 1.9 KiB | text/x-python | PythonLexer
Pulkit Goyal
py3: make test-walkrepo use print_function
r28676 from __future__ import absolute_import, print_function
Gregory Szorc
tests: use absolute_import in test-walkrepo
r27300
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 import os
Gregory Szorc
tests: use absolute_import in test-walkrepo
r27300
from mercurial import (
hg,
scmutil,
Yuya Nishihara
tests: alias ui as uimod in test-walkrepo
r28777 ui as uimod,
Gregory Szorc
tests: use absolute_import in test-walkrepo
r27300 util,
)
chdir = os.chdir
mkdir = os.mkdir
pjoin = os.path.join
walkrepos = scmutil.walkrepos
checklink = util.checklink
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
Yuya Nishihara
tests: alias ui as uimod in test-walkrepo
r28777 u = uimod.ui()
Matt Mackall
tests: make test-walkrepo use hg's symlink test
r16321 sym = checklink('.')
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
hg.repository(u, 'top1', create=1)
mkdir('subdir')
chdir('subdir')
hg.repository(u, 'sub1', create=1)
mkdir('subsubdir')
chdir('subsubdir')
hg.repository(u, 'subsub1', create=1)
chdir(os.path.pardir)
if sym:
os.symlink(os.path.pardir, 'circle')
os.symlink(pjoin('subsubdir', 'subsub1'), 'subsub1')
def runtest():
reposet = frozenset(walkrepos('.', followsym=True))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if sym and (len(reposet) != 3):
Pulkit Goyal
py3: make test-walkrepo use print_function
r28676 print("reposet = %r" % (reposet,))
print(("Found %d repositories when I should have found 3"
% (len(reposet),)))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if (not sym) and (len(reposet) != 2):
Pulkit Goyal
py3: make test-walkrepo use print_function
r28676 print("reposet = %r" % (reposet,))
print(("Found %d repositories when I should have found 2"
% (len(reposet),)))
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub1set = frozenset((pjoin('.', 'sub1'),
pjoin('.', 'circle', 'subdir', 'sub1')))
if len(sub1set & reposet) != 1:
Pulkit Goyal
py3: make test-walkrepo use print_function
r28676 print("sub1set = %r" % (sub1set,))
print("reposet = %r" % (reposet,))
print("sub1set and reposet should have exactly one path in common.")
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub2set = frozenset((pjoin('.', 'subsub1'),
pjoin('.', 'subsubdir', 'subsub1')))
if len(sub2set & reposet) != 1:
Pulkit Goyal
py3: make test-walkrepo use print_function
r28676 print("sub2set = %r" % (sub2set,))
print("reposet = %r" % (reposet,))
print("sub2set and reposet should have exactly one path in common.")
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub3 = pjoin('.', 'circle', 'top1')
Brodie Rao
cleanup: "not x in y" -> "x not in y"
r16686 if sym and sub3 not in reposet:
Pulkit Goyal
py3: make test-walkrepo use print_function
r28676 print("reposet = %r" % (reposet,))
print("Symbolic links are supported and %s is not in reposet" % (sub3,))
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
runtest()
if sym:
# Simulate not having symlinks.
del os.path.samestat
sym = False
runtest()