##// 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:

r28917:f798ffe7 default
r29452:26a5d605 3.8.4 stable
Show More
test-run-tests.py
99 lines | 2.6 KiB | text/x-python | PythonLexer
/ tests / test-run-tests.py
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 """test line matching with some failing examples and some which warn
run-test.t only checks positive matches and can not see warnings
(both by design)
"""
Pulkit Goyal
tests: make test-run-tests use absolute_import
r28917 from __future__ import absolute_import, print_function
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271
Pulkit Goyal
tests: make test-run-tests use absolute_import
r28917 import doctest
import os
import re
Simon Heimberg
tests: fix test-run-tests.py on OS X...
r20284 # this is hack to make sure no escape characters are inserted into the output
if 'TERM' in os.environ:
del os.environ['TERM']
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 run_tests = __import__('run-tests')
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 def prn(ex):
m = ex.args[0]
if isinstance(m, str):
print(m)
else:
print(m.decode('utf-8'))
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 def lm(expected, output):
r"""check if output matches expected
does it generally work?
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'H*e (glob)\n', b'Here\n')
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 True
fail on bad test data
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> try: lm(b'a\n',b'a')
... except AssertionError as ex: print(ex)
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 missing newline
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> try: lm(b'single backslash\n', b'single \backslash\n')
... except AssertionError as ex: prn(ex)
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 single backslash or unknown char
"""
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 assert (expected.endswith(b'\n')
and output.endswith(b'\n')), 'missing newline'
assert not re.search(br'[^ \w\\/\r\n()*?]', expected + output), \
b'single backslash or unknown char'
Gregory Szorc
run-tests: make linematch a static method of TTest...
r21315 match = run_tests.TTest.linematch(expected, output)
Simon Heimberg
run-tests: suggest to append glob when only path sep does not match...
r20273 if isinstance(match, str):
return 'special: ' + match
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 elif isinstance(match, bytes):
return 'special: ' + match.decode('utf-8')
Simon Heimberg
run-tests: suggest to append glob when only path sep does not match...
r20273 else:
return bool(match) # do not return match object
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271
def wintests():
r"""test matching like running on windows
enable windows matching on any os
>>> _osaltsep = os.altsep
>>> os.altsep = True
valid match on windows
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'g/a*/d (glob)\n', b'g\\abc/d\n')
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 True
direct matching, glob unnecessary
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'g/b (glob)\n', b'g/b\n')
Simon Heimberg
run-tests: print more information on unnecessary glob matching...
r20274 'special: -glob'
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271
missing glob
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'/g/c/d/fg\n', b'\\g\\c\\d/fg\n')
Simon Heimberg
run-tests: suggest to append glob when only path sep does not match...
r20273 'special: +glob'
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271
restore os.altsep
>>> os.altsep = _osaltsep
"""
Simon Heimberg
tests: fix test-run-tests.py on OS X...
r20284 pass
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271
def otherostests():
r"""test matching like running on non-windows os
disable windows matching on any os
>>> _osaltsep = os.altsep
>>> os.altsep = False
backslash does not match slash
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'h/a* (glob)\n', b'h\\ab\n')
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 False
direct matching glob can not be recognized
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'h/b (glob)\n', b'h/b\n')
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 True
missing glob can not not be recognized
Augie Fackler
test-run-tests: fix for Python 3.5...
r25061 >>> lm(b'/h/c/df/g/\n', b'\\h/c\\df/g\\\n')
Simon Heimberg
tests: new test for line matching functions in run-tests...
r20271 False
restore os.altsep
>>> os.altsep = _osaltsep
"""
pass
if __name__ == '__main__':
doctest.testmod()