Mercurial > public > mercurial-scm > hg
annotate tests/test-url.py @ 45892:06b64fabf91c
copies: cache the ancestor checking call when tracing copy
A good share of the time spent in this function is spent doing ancestors
checking. To avoid spending time in duplicated call, we cache the result of
calls.
In the slower case, this provide a quite significant performance boost. Below
are the result for a set of selected pairs (many of them pathological):
(And further down is another table that summarize the current state of filelog
based vs changeset base copy tracing)
The benchmark have been configured to be killed after 6 minutes of runtime,
which mean that any detect slower than 2 minutes will be marked as "killed".
This drop some useful information about how much slower these case are? but also
prevent 99% of the benchmark time to be spent on case that can be labelled "very
slow" anyway.
Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor
------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309
Below is a table comparing the runtime of the current "filelog centric"
algorithm, with the "changeset centric" one, we just modified.
The changeset centric algorithm is a significant win in many scenario, but they
are still various cases where it is quite slower. When many revision has to be
considered the cost of retrieving the copy information, creating new
dictionaries, merging dictionaries and checking if revision are ancestors of
each other can slow things down.
The rest of this series, will introduce a rust version of the copy tracing code
to deal with most of theses issues.
Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor
---------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097
mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564
mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed
mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917
mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed
mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed
Differential Revision: https://phab.mercurial-scm.org/D9296
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 02 Nov 2020 11:03:56 +0100 |
parents | 223296268c4e |
children | ffd3e823a7e5 |
rev | line source |
---|---|
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
1 # coding=utf-8 |
28914
63fe5ddb8715
tests: make test-url use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28677
diff
changeset
|
2 from __future__ import absolute_import, print_function |
63fe5ddb8715
tests: make test-url use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28677
diff
changeset
|
3 |
63fe5ddb8715
tests: make test-url use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28677
diff
changeset
|
4 import doctest |
15398
474279be5add
tests: fix readline escape characters in heredoctest.py/test-url.py
Brodie Rao <brodie@bitheap.org>
parents:
15018
diff
changeset
|
5 import os |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
6 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
7 |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
8 def check(a, b): |
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
9 if a != b: |
28677
2903558a6991
py3: make test-url use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
26421
diff
changeset
|
10 print((a, b)) |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
11 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
12 |
12606
5c8353692123
test-url: refactor with shorter lines
Martin Geisler <mg@aragost.com>
parents:
12592
diff
changeset
|
13 def cert(cn): |
20685
56b1f39dd0c1
test-url: move from dict() construction to {} literals
Augie Fackler <raf@durin42.com>
parents:
15611
diff
changeset
|
14 return {'subject': ((('commonName', cn),),)} |
12606
5c8353692123
test-url: refactor with shorter lines
Martin Geisler <mg@aragost.com>
parents:
12592
diff
changeset
|
15 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
16 |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
17 from mercurial import sslutil |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
18 |
28914
63fe5ddb8715
tests: make test-url use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28677
diff
changeset
|
19 _verifycert = sslutil._verifycert |
12724
66e7ba85585b
test-url: remove trailing whitespace
Augie Fackler <durin42@gmail.com>
parents:
12606
diff
changeset
|
20 # Test non-wildcard certificates |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
21 check(_verifycert(cert('example.com'), 'example.com'), None) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
22 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
23 _verifycert(cert('example.com'), 'www.example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
24 b'certificate is for example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
25 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
26 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
27 _verifycert(cert('www.example.com'), 'example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
28 b'certificate is for www.example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
29 ) |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
30 |
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
31 # Test wildcard certificates |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
32 check(_verifycert(cert('*.example.com'), 'www.example.com'), None) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
33 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
34 _verifycert(cert('*.example.com'), 'example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
35 b'certificate is for *.example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
36 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
37 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
38 _verifycert(cert('*.example.com'), 'w.w.example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
39 b'certificate is for *.example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
40 ) |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
41 |
13249
75d0c38a0bca
url: check subjectAltName when verifying ssl certificate
Yuya Nishihara <yuya@tcha.org>
parents:
13248
diff
changeset
|
42 # Test subjectAltName |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
43 san_cert = { |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
44 'subject': ((('commonName', 'example.com'),),), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
45 'subjectAltName': (('DNS', '*.example.net'), ('DNS', 'example.net')), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
46 } |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
47 check(_verifycert(san_cert, 'example.net'), None) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
48 check(_verifycert(san_cert, 'foo.example.net'), None) |
14666
27b080aa880a
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
Nicolas Bareil <nico@chdir.org>
parents:
14313
diff
changeset
|
49 # no fallback to subject commonName when subjectAltName has DNS |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
50 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
51 _verifycert(san_cert, 'example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
52 b'certificate is for *.example.net, example.net', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
53 ) |
14666
27b080aa880a
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
Nicolas Bareil <nico@chdir.org>
parents:
14313
diff
changeset
|
54 # fallback to subject commonName when no DNS in subjectAltName |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
55 san_cert = { |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
56 'subject': ((('commonName', 'example.com'),),), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
57 'subjectAltName': (('IP Address', '8.8.8.8'),), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
58 } |
14666
27b080aa880a
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
Nicolas Bareil <nico@chdir.org>
parents:
14313
diff
changeset
|
59 check(_verifycert(san_cert, 'example.com'), None) |
13249
75d0c38a0bca
url: check subjectAltName when verifying ssl certificate
Yuya Nishihara <yuya@tcha.org>
parents:
13248
diff
changeset
|
60 |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
61 # Avoid some pitfalls |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
62 check(_verifycert(cert('*.foo'), 'foo'), b'certificate is for *.foo') |
29452
26a5d605b868
sslutil: synchronize hostname matching logic with CPython
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29451
diff
changeset
|
63 check(_verifycert(cert('*o'), 'foo'), None) |
12592
f2937d6492c5
url: verify correctness of https server certificates (issue2407)
Mads Kiilerich <mads@kiilerich.com>
parents:
diff
changeset
|
64 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
65 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
66 _verifycert({'subject': ()}, 'example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
67 b'no commonName or subjectAltName found in certificate', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
68 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
69 check(_verifycert(None, 'example.com'), b'no certificate received') |
13248
00411a4fa1bb
url: fix UnicodeDecodeError on certificate verification error
Yuya Nishihara <yuya@tcha.org>
parents:
12865
diff
changeset
|
70 |
14666
27b080aa880a
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
Nicolas Bareil <nico@chdir.org>
parents:
14313
diff
changeset
|
71 # Unicode (IDN) certname isn't supported |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
72 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
73 _verifycert(cert(u'\u4f8b.jp'), 'example.jp'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
74 b'IDN in certificate not supported', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
75 ) |
14666
27b080aa880a
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
Nicolas Bareil <nico@chdir.org>
parents:
14313
diff
changeset
|
76 |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
77 # The following tests are from CPython's test_ssl.py. |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
78 check(_verifycert(cert('example.com'), 'example.com'), None) |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
79 check(_verifycert(cert('example.com'), 'ExAmple.cOm'), None) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
80 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
81 _verifycert(cert('example.com'), 'www.example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
82 b'certificate is for example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
83 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
84 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
85 _verifycert(cert('example.com'), '.example.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
86 b'certificate is for example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
87 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
88 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
89 _verifycert(cert('example.com'), 'example.org'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
90 b'certificate is for example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
91 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
92 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
93 _verifycert(cert('example.com'), 'exampleXcom'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
94 b'certificate is for example.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
95 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
96 check(_verifycert(cert('*.a.com'), 'foo.a.com'), None) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
97 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
98 _verifycert(cert('*.a.com'), 'bar.foo.a.com'), b'certificate is for *.a.com' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
99 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
100 check(_verifycert(cert('*.a.com'), 'a.com'), b'certificate is for *.a.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
101 check(_verifycert(cert('*.a.com'), 'Xa.com'), b'certificate is for *.a.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
102 check(_verifycert(cert('*.a.com'), '.a.com'), b'certificate is for *.a.com') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
103 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
104 # only match one left-most wildcard |
29452
26a5d605b868
sslutil: synchronize hostname matching logic with CPython
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29451
diff
changeset
|
105 check(_verifycert(cert('f*.com'), 'foo.com'), None) |
26a5d605b868
sslutil: synchronize hostname matching logic with CPython
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29451
diff
changeset
|
106 check(_verifycert(cert('f*.com'), 'f.com'), None) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
107 check(_verifycert(cert('f*.com'), 'bar.com'), b'certificate is for f*.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
108 check(_verifycert(cert('f*.com'), 'foo.a.com'), b'certificate is for f*.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
109 check(_verifycert(cert('f*.com'), 'bar.foo.com'), b'certificate is for f*.com') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
110 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
111 # NULL bytes are bad, CVE-2013-4073 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
112 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
113 _verifycert( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
114 cert('null.python.org\x00example.org'), 'null.python.org\x00example.org' |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
115 ), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
116 None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
117 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
118 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
119 _verifycert(cert('null.python.org\x00example.org'), 'example.org'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
120 b'certificate is for null.python.org\x00example.org', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
121 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
122 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
123 _verifycert(cert('null.python.org\x00example.org'), 'null.python.org'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
124 b'certificate is for null.python.org\x00example.org', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
125 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
126 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
127 # error cases with wildcards |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
128 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
129 _verifycert(cert('*.*.a.com'), 'bar.foo.a.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
130 b'certificate is for *.*.a.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
131 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
132 check(_verifycert(cert('*.*.a.com'), 'a.com'), b'certificate is for *.*.a.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
133 check(_verifycert(cert('*.*.a.com'), 'Xa.com'), b'certificate is for *.*.a.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
134 check(_verifycert(cert('*.*.a.com'), '.a.com'), b'certificate is for *.*.a.com') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
135 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
136 check(_verifycert(cert('a.*.com'), 'a.foo.com'), b'certificate is for a.*.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
137 check(_verifycert(cert('a.*.com'), 'a..com'), b'certificate is for a.*.com') |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
138 check(_verifycert(cert('a.*.com'), 'a.com'), b'certificate is for a.*.com') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
139 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
140 # wildcard doesn't match IDNA prefix 'xn--' |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
141 idna = u'püthon.python.org'.encode('idna').decode('ascii') |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
142 check(_verifycert(cert(idna), idna), None) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
143 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
144 _verifycert(cert('x*.python.org'), idna), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
145 b'certificate is for x*.python.org', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
146 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
147 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
148 _verifycert(cert('xn--p*.python.org'), idna), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
149 b'certificate is for xn--p*.python.org', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
150 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
151 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
152 # wildcard in first fragment and IDNA A-labels in sequent fragments |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
153 # are supported. |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
154 idna = u'www*.pythön.org'.encode('idna').decode('ascii') |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
155 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
156 _verifycert(cert(idna), u'www.pythön.org'.encode('idna').decode('ascii')), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
157 None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
158 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
159 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
160 _verifycert(cert(idna), u'www1.pythön.org'.encode('idna').decode('ascii')), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
161 None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
162 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
163 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
164 _verifycert(cert(idna), u'ftp.pythön.org'.encode('idna').decode('ascii')), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
165 b'certificate is for www*.xn--pythn-mua.org', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
166 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
167 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
168 _verifycert(cert(idna), u'pythön.org'.encode('idna').decode('ascii')), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
169 b'certificate is for www*.xn--pythn-mua.org', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
170 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
171 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
172 c = { |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
173 'notAfter': 'Jun 26 21:41:46 2011 GMT', |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
174 'subject': (((u'commonName', u'linuxfrz.org'),),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
175 'subjectAltName': ( |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
176 ('DNS', 'linuxfr.org'), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
177 ('DNS', 'linuxfr.com'), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
178 ('othername', '<unsupported>'), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
179 ), |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
180 } |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
181 check(_verifycert(c, 'linuxfr.org'), None) |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
182 check(_verifycert(c, 'linuxfr.com'), None) |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
183 # Not a "DNS" entry |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
184 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
185 _verifycert(c, '<unsupported>'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
186 b'certificate is for linuxfr.org, linuxfr.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
187 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
188 # When there is a subjectAltName, commonName isn't used |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
189 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
190 _verifycert(c, 'linuxfrz.org'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
191 b'certificate is for linuxfr.org, linuxfr.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
192 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
193 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
194 # A pristine real-world example |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
195 c = { |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
196 'notAfter': 'Dec 18 23:59:59 2011 GMT', |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
197 'subject': ( |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
198 ((u'countryName', u'US'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
199 ((u'stateOrProvinceName', u'California'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
200 ((u'localityName', u'Mountain View'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
201 ((u'organizationName', u'Google Inc'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
202 ((u'commonName', u'mail.google.com'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
203 ), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
204 } |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
205 check(_verifycert(c, 'mail.google.com'), None) |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
206 check(_verifycert(c, 'gmail.com'), b'certificate is for mail.google.com') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
207 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
208 # Only commonName is considered |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
209 check(_verifycert(c, 'California'), b'certificate is for mail.google.com') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
210 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
211 # Neither commonName nor subjectAltName |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
212 c = { |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
213 'notAfter': 'Dec 18 23:59:59 2011 GMT', |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
214 'subject': ( |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
215 ((u'countryName', u'US'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
216 ((u'stateOrProvinceName', u'California'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
217 ((u'localityName', u'Mountain View'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
218 ((u'organizationName', u'Google Inc'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
219 ), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
220 } |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
221 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
222 _verifycert(c, 'mail.google.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
223 b'no commonName or subjectAltName found in certificate', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
224 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
225 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
226 # No DNS entry in subjectAltName but a commonName |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
227 c = { |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
228 'notAfter': 'Dec 18 23:59:59 2099 GMT', |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
229 'subject': ( |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
230 ((u'countryName', u'US'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
231 ((u'stateOrProvinceName', u'California'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
232 ((u'localityName', u'Mountain View'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
233 ((u'commonName', u'mail.google.com'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
234 ), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
235 'subjectAltName': (('othername', 'blabla'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
236 } |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
237 check(_verifycert(c, 'mail.google.com'), None) |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
238 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
239 # No DNS entry subjectAltName and no commonName |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
240 c = { |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
241 'notAfter': 'Dec 18 23:59:59 2099 GMT', |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
242 'subject': ( |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
243 ((u'countryName', u'US'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
244 ((u'stateOrProvinceName', u'California'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
245 ((u'localityName', u'Mountain View'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
246 ((u'organizationName', u'Google Inc'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
247 ), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
248 'subjectAltName': (('othername', 'blabla'),), |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
249 } |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
250 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
251 _verifycert(c, 'google.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
252 b'no commonName or subjectAltName found in certificate', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
253 ) |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
254 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
255 # Empty cert / no cert |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
256 check(_verifycert(None, 'example.com'), b'no certificate received') |
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
257 check(_verifycert({}, 'example.com'), b'no certificate received') |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
258 |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
259 # avoid denials of service by refusing more than one |
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
260 # wildcard per fragment. |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
261 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
262 _verifycert({'subject': (((u'commonName', u'a*b.com'),),)}, 'axxb.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
263 None, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
264 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
265 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
266 _verifycert({'subject': (((u'commonName', u'a*b.co*'),),)}, 'axxb.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
267 b'certificate is for a*b.co*', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
268 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
269 check( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
270 _verifycert({'subject': (((u'commonName', u'a*b*.com'),),)}, 'axxbxxc.com'), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
271 b'too many wildcards in certificate DNS name: a*b*.com', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
272 ) |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
273 |
29451
676f4d0e3a7b
tests: import CPython's hostname matching tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28914
diff
changeset
|
274 |
13770 | 275 def test_url(): |
276 """ | |
37874
0dcd03637d36
tests: fix error case in test-url.py's doctest
Augie Fackler <augie@google.com>
parents:
29452
diff
changeset
|
277 >>> from mercurial import error, pycompat |
37955
d088810c496e
tests: fix deprecation warning in test-url.py
Augie Fackler <augie@google.com>
parents:
37875
diff
changeset
|
278 >>> from mercurial.util import url |
d088810c496e
tests: fix deprecation warning in test-url.py
Augie Fackler <augie@google.com>
parents:
37875
diff
changeset
|
279 >>> from mercurial.utils.stringutil import forcebytestr |
13770 | 280 |
281 This tests for edge cases in url.URL's parsing algorithm. Most of | |
282 these aren't useful for documentation purposes, so they aren't | |
283 part of the class's doc tests. | |
284 | |
285 Query strings and fragments: | |
286 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
287 >>> url(b'http://host/a?b#c') |
13770 | 288 <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
289 >>> url(b'http://host/a?') |
13770 | 290 <url scheme: 'http', host: 'host', path: 'a'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
291 >>> url(b'http://host/a#b#c') |
13770 | 292 <url scheme: 'http', host: 'host', path: 'a', fragment: 'b#c'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
293 >>> url(b'http://host/a#b?c') |
13770 | 294 <url scheme: 'http', host: 'host', path: 'a', fragment: 'b?c'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
295 >>> url(b'http://host/?a#b') |
13770 | 296 <url scheme: 'http', host: 'host', path: '', query: 'a', fragment: 'b'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
297 >>> url(b'http://host/?a#b', parsequery=False) |
13770 | 298 <url scheme: 'http', host: 'host', path: '?a', fragment: 'b'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
299 >>> url(b'http://host/?a#b', parsefragment=False) |
13770 | 300 <url scheme: 'http', host: 'host', path: '', query: 'a#b'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
301 >>> url(b'http://host/?a#b', parsequery=False, parsefragment=False) |
13770 | 302 <url scheme: 'http', host: 'host', path: '?a#b'> |
303 | |
304 IPv6 addresses: | |
305 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
306 >>> url(b'ldap://[2001:db8::7]/c=GB?objectClass?one') |
13770 | 307 <url scheme: 'ldap', host: '[2001:db8::7]', path: 'c=GB', |
308 query: 'objectClass?one'> | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
309 >>> url(b'ldap://joe:xxx@[2001:db8::7]:80/c=GB?objectClass?one') |
13770 | 310 <url scheme: 'ldap', user: 'joe', passwd: 'xxx', host: '[2001:db8::7]', |
311 port: '80', path: 'c=GB', query: 'objectClass?one'> | |
312 | |
313 Missing scheme, host, etc.: | |
314 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
315 >>> url(b'://192.0.2.16:80/') |
13770 | 316 <url path: '://192.0.2.16:80/'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
317 >>> url(b'https://mercurial-scm.org') |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
20685
diff
changeset
|
318 <url scheme: 'https', host: 'mercurial-scm.org'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
319 >>> url(b'/foo') |
13770 | 320 <url path: '/foo'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
321 >>> url(b'bundle:/foo') |
13770 | 322 <url scheme: 'bundle', path: '/foo'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
323 >>> url(b'a?b#c') |
13770 | 324 <url path: 'a?b', fragment: 'c'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
325 >>> url(b'http://x.com?arg=/foo') |
13770 | 326 <url scheme: 'http', host: 'x.com', query: 'arg=/foo'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
327 >>> url(b'http://joe:xxx@/foo') |
13770 | 328 <url scheme: 'http', user: 'joe', passwd: 'xxx', path: 'foo'> |
329 | |
330 Just a scheme and a path: | |
331 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
332 >>> url(b'mailto:John.Doe@example.com') |
13770 | 333 <url scheme: 'mailto', path: 'John.Doe@example.com'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
334 >>> url(b'a:b:c:d') |
13808 | 335 <url path: 'a:b:c:d'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
336 >>> url(b'aa:bb:cc:dd') |
13808 | 337 <url scheme: 'aa', path: 'bb:cc:dd'> |
13770 | 338 |
339 SSH examples: | |
340 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
341 >>> url(b'ssh://joe@host//home/joe') |
13770 | 342 <url scheme: 'ssh', user: 'joe', host: 'host', path: '/home/joe'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
343 >>> url(b'ssh://joe:xxx@host/src') |
13770 | 344 <url scheme: 'ssh', user: 'joe', passwd: 'xxx', host: 'host', path: 'src'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
345 >>> url(b'ssh://joe:xxx@host') |
13770 | 346 <url scheme: 'ssh', user: 'joe', passwd: 'xxx', host: 'host'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
347 >>> url(b'ssh://joe@host') |
13770 | 348 <url scheme: 'ssh', user: 'joe', host: 'host'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
349 >>> url(b'ssh://host') |
13770 | 350 <url scheme: 'ssh', host: 'host'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
351 >>> url(b'ssh://') |
13770 | 352 <url scheme: 'ssh'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
353 >>> url(b'ssh:') |
13770 | 354 <url scheme: 'ssh'> |
355 | |
356 Non-numeric port: | |
357 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
358 >>> url(b'http://example.com:dd') |
13770 | 359 <url scheme: 'http', host: 'example.com', port: 'dd'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
360 >>> url(b'ssh://joe:xxx@host:ssh/foo') |
13770 | 361 <url scheme: 'ssh', user: 'joe', passwd: 'xxx', host: 'host', port: 'ssh', |
362 path: 'foo'> | |
363 | |
364 Bad authentication credentials: | |
365 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
366 >>> url(b'http://joe@joeville:123@4:@host/a?b#c') |
13770 | 367 <url scheme: 'http', user: 'joe@joeville', passwd: '123@4:', |
368 host: 'host', path: 'a', query: 'b', fragment: 'c'> | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
369 >>> url(b'http://!*#?/@!*#?/:@host/a?b#c') |
13770 | 370 <url scheme: 'http', host: '!*', fragment: '?/@!*#?/:@host/a?b#c'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
371 >>> url(b'http://!*#?@!*#?:@host/a?b#c') |
13770 | 372 <url scheme: 'http', host: '!*', fragment: '?@!*#?:@host/a?b#c'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
373 >>> url(b'http://!*@:!*@@host/a?b#c') |
13770 | 374 <url scheme: 'http', user: '!*@', passwd: '!*@', host: 'host', |
375 path: 'a', query: 'b', fragment: 'c'> | |
376 | |
377 File paths: | |
378 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
379 >>> url(b'a/b/c/d.g.f') |
13770 | 380 <url path: 'a/b/c/d.g.f'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
381 >>> url(b'/x///z/y/') |
13770 | 382 <url path: '/x///z/y/'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
383 >>> url(b'/foo:bar') |
13848
b2798c1defff
url: be stricter about detecting schemes
Brodie Rao <brodie@bitheap.org>
parents:
13827
diff
changeset
|
384 <url path: '/foo:bar'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
385 >>> url(b'\\\\foo:bar') |
13848
b2798c1defff
url: be stricter about detecting schemes
Brodie Rao <brodie@bitheap.org>
parents:
13827
diff
changeset
|
386 <url path: '\\\\foo:bar'> |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
387 >>> url(b'./foo:bar') |
13848
b2798c1defff
url: be stricter about detecting schemes
Brodie Rao <brodie@bitheap.org>
parents:
13827
diff
changeset
|
388 <url path: './foo:bar'> |
13770 | 389 |
13817
7f18bab2c0b0
url: abort on file:// URLs with non-localhost hosts
Brodie Rao <brodie@bitheap.org>
parents:
13808
diff
changeset
|
390 Non-localhost file URL: |
7f18bab2c0b0
url: abort on file:// URLs with non-localhost hosts
Brodie Rao <brodie@bitheap.org>
parents:
13808
diff
changeset
|
391 |
37874
0dcd03637d36
tests: fix error case in test-url.py's doctest
Augie Fackler <augie@google.com>
parents:
29452
diff
changeset
|
392 >>> try: |
0dcd03637d36
tests: fix error case in test-url.py's doctest
Augie Fackler <augie@google.com>
parents:
29452
diff
changeset
|
393 ... u = url(b'file://mercurial-scm.org/foo') |
0dcd03637d36
tests: fix error case in test-url.py's doctest
Augie Fackler <augie@google.com>
parents:
29452
diff
changeset
|
394 ... except error.Abort as e: |
45687
223296268c4e
tests: fix test-url.py on py3, broken by D9179
Martin von Zweigbergk <martinvonz@google.com>
parents:
45682
diff
changeset
|
395 ... pycompat.bytestr(e.message) |
37874
0dcd03637d36
tests: fix error case in test-url.py's doctest
Augie Fackler <augie@google.com>
parents:
29452
diff
changeset
|
396 'file:// URLs can only refer to localhost' |
13817
7f18bab2c0b0
url: abort on file:// URLs with non-localhost hosts
Brodie Rao <brodie@bitheap.org>
parents:
13808
diff
changeset
|
397 |
13770 | 398 Empty URL: |
399 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
400 >>> u = url(b'') |
13770 | 401 >>> u |
402 <url path: ''> | |
403 >>> str(u) | |
404 '' | |
405 | |
406 Empty path with query string: | |
407 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
408 >>> str(url(b'http://foo/?bar')) |
13770 | 409 'http://foo/?bar' |
410 | |
411 Invalid path: | |
412 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
413 >>> u = url(b'http://foo/bar') |
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
414 >>> u.path = b'bar' |
13770 | 415 >>> str(u) |
416 'http://foo/bar' | |
417 | |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
418 >>> u = url(b'file:/foo/bar/baz') |
14313
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
419 >>> u |
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
420 <url scheme: 'file', path: '/foo/bar/baz'> |
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
421 >>> str(u) |
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
422 'file:///foo/bar/baz' |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
423 >>> pycompat.bytestr(u.localpath()) |
15018
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
424 '/foo/bar/baz' |
14313
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
425 |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
426 >>> u = url(b'file:///foo/bar/baz') |
13770 | 427 >>> u |
428 <url scheme: 'file', path: '/foo/bar/baz'> | |
429 >>> str(u) | |
14313
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
430 'file:///foo/bar/baz' |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
431 >>> pycompat.bytestr(u.localpath()) |
15018
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
432 '/foo/bar/baz' |
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
433 |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
434 >>> u = url(b'file:///f:oo/bar/baz') |
15018
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
435 >>> u |
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
436 <url scheme: 'file', path: 'f:oo/bar/baz'> |
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
437 >>> str(u) |
15611 | 438 'file:///f:oo/bar/baz' |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
439 >>> pycompat.bytestr(u.localpath()) |
15018
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
440 'f:oo/bar/baz' |
14313
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
441 |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
442 >>> u = url(b'file://localhost/f:oo/bar/baz') |
15496
396e83d635a6
url: handle file://localhost/c:/foo "correctly"
Mads Kiilerich <mads@kiilerich.com>
parents:
15398
diff
changeset
|
443 >>> u |
396e83d635a6
url: handle file://localhost/c:/foo "correctly"
Mads Kiilerich <mads@kiilerich.com>
parents:
15398
diff
changeset
|
444 <url scheme: 'file', host: 'localhost', path: 'f:oo/bar/baz'> |
396e83d635a6
url: handle file://localhost/c:/foo "correctly"
Mads Kiilerich <mads@kiilerich.com>
parents:
15398
diff
changeset
|
445 >>> str(u) |
15513 | 446 'file://localhost/f:oo/bar/baz' |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
447 >>> pycompat.bytestr(u.localpath()) |
15496
396e83d635a6
url: handle file://localhost/c:/foo "correctly"
Mads Kiilerich <mads@kiilerich.com>
parents:
15398
diff
changeset
|
448 'f:oo/bar/baz' |
396e83d635a6
url: handle file://localhost/c:/foo "correctly"
Mads Kiilerich <mads@kiilerich.com>
parents:
15398
diff
changeset
|
449 |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
450 >>> u = url(b'file:foo/bar/baz') |
14313
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
451 >>> u |
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
452 <url scheme: 'file', path: 'foo/bar/baz'> |
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
453 >>> str(u) |
a389dd285282
util: make str(url) return file:/// for abs paths again
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14204
diff
changeset
|
454 'file:foo/bar/baz' |
37875
078c3eec2d5c
tests: port test-url.py to Python 3
Augie Fackler <augie@google.com>
parents:
37874
diff
changeset
|
455 >>> pycompat.bytestr(u.localpath()) |
15018
e89f62dcd723
url: really handle urls of the form file:///c:/foo/bar/ correctly
Mads Kiilerich <mads@kiilerich.com>
parents:
14666
diff
changeset
|
456 'foo/bar/baz' |
13770 | 457 """ |
458 | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
37955
diff
changeset
|
459 |
15398
474279be5add
tests: fix readline escape characters in heredoctest.py/test-url.py
Brodie Rao <brodie@bitheap.org>
parents:
15018
diff
changeset
|
460 if 'TERM' in os.environ: |
474279be5add
tests: fix readline escape characters in heredoctest.py/test-url.py
Brodie Rao <brodie@bitheap.org>
parents:
15018
diff
changeset
|
461 del os.environ['TERM'] |
474279be5add
tests: fix readline escape characters in heredoctest.py/test-url.py
Brodie Rao <brodie@bitheap.org>
parents:
15018
diff
changeset
|
462 |
13770 | 463 doctest.testmod(optionflags=doctest.NORMALIZE_WHITESPACE) |