upstream/mercurial-mirror Files · tests/test-http-proxy.t

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.

Mike Hommey - - Load All Authors

File last commit:

r29064:9dc27a33 stable


                r29452:26a5d605

3.8.4 stable

Download file

             test-http-proxy.t
        
                    125 lines
            
             | 6.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-http-proxy.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve

        Pierre-Yves David
    
test: use bundle2 in test-http-proxy...

              r25371
            
        $ cat << EOF >> $HGRCPATH

        > [experimental]

        > # drop me once bundle2 is the default,

        > # added to get test change early.

        > bundle2-exp = True

        > EOF

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Ama -d '1123456789 0'

        adding a

        Jun Wu
    
tests: reorder hg serve commands...

              r28549
            
        $ hg serve --config server.uncompressed=True -p $HGPORT -d --pid-file=hg.pid

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        $ cat hg.pid >> $DAEMON_PIDS

        $ cd ..

        Matt Mackall
    
tests: drop explicit $TESTDIR from executables...

              r25472
            
        $ tinyproxy.py $HGPORT1 localhost >proxy.log 2>&1 </dev/null &

        Mads Kiilerich
    
tests: use 'do sleep 0' instead of 'do true', also on first line of command...

              r16496
            
        $ while [ ! -f proxy.pid ]; do sleep 0; done

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        $ cat proxy.pid >> $DAEMON_PIDS

      url for proxy, stream

        $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b

        streaming all changes

        3 files to transfer, 303 bytes of data

        Thomas Arendsen Hein
    
tests: check for (*/sec) instead of (*B/sec) to match (X bytes/sec)...

              r14023
            
        transferred * bytes in * seconds (*/sec) (glob)

        Durham Goode
    
clone: fix copying bookmarks in uncompressed clones (issue4430)...

              r23116
            
        searching for changes

        no changes found

        Matt Mackall
    
tests: unify test-http-proxy

              r12449
            
        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ cd ..

      url for proxy, pull

        $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd b-pull

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ cd ..

      host:port for proxy

        $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      proxy url with user name and password

        $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      url with user name and password

        $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      bad host:port for proxy

        $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f

        abort: error: Connection refused

        [255]

      do not use the proxy if it is in the no list

        $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat proxy.log

        Mads Kiilerich
    
tests: reintroduce ":$HGPORT" in test output...

              r12643
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Tomasz Kleczek
    
branchcache: fetch source branchcache during clone (issue3378)...

              r17740
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob)

        Mads Kiilerich
    
tests: reintroduce ":$HGPORT" in test output...

              r12643
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)

        Durham Goode
    
clone: fix copying bookmarks in uncompressed clones (issue4430)...

              r23116
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob)

        Mike Hommey
    
bundle2: properly request phases during getbundle...

              r29064
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)

        Pierre-Yves David
    
test: use bundle2 in test-http-proxy...

              r25371
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Mike Hommey
    
bundle2: properly request phases during getbundle...

              r29064
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)

        Matt Mackall
    
bookmarks: merge low-level push/pull support into core

              r13364
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Peter Arrenbrecht
    
setdiscovery: batch heads and known(ownheads)...

              r14624
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Mike Hommey
    
bundle2: properly request phases during getbundle...

              r29064
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)

        Matt Mackall
    
bookmarks: merge low-level push/pull support into core

              r13364
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Peter Arrenbrecht
    
setdiscovery: batch heads and known(ownheads)...

              r14624
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Mike Hommey
    
bundle2: properly request phases during getbundle...

              r29064
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)

        Matt Mackall
    
bookmarks: merge low-level push/pull support into core

              r13364
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)

        Peter Arrenbrecht
    
setdiscovery: batch heads and known(ownheads)...

              r14624
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)

        Mike Hommey
    
bundle2: properly request phases during getbundle...

              r29064
            
        * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require serve
Pierre-Yves David test: use bundle2 in test-http-proxy...	r25371	$ cat << EOF >> $HGRCPATH
		> [experimental]
		> # drop me once bundle2 is the default,
		> # added to get test change early.
		> bundle2-exp = True
		> EOF
Matt Mackall tests: unify test-http-proxy	r12449
		$ hg init a
		$ cd a
		$ echo a > a
		$ hg ci -Ama -d '1123456789 0'
		adding a
Jun Wu tests: reorder hg serve commands...	r28549	$ hg serve --config server.uncompressed=True -p $HGPORT -d --pid-file=hg.pid
Matt Mackall tests: unify test-http-proxy	r12449	$ cat hg.pid >> $DAEMON_PIDS
		$ cd ..
Matt Mackall tests: drop explicit $TESTDIR from executables...	r25472	$ tinyproxy.py $HGPORT1 localhost >proxy.log 2>&1 </dev/null &
Mads Kiilerich tests: use 'do sleep 0' instead of 'do true', also on first line of command...	r16496	$ while [ ! -f proxy.pid ]; do sleep 0; done
Matt Mackall tests: unify test-http-proxy	r12449	$ cat proxy.pid >> $DAEMON_PIDS

		url for proxy, stream

		$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b
		streaming all changes
		3 files to transfer, 303 bytes of data
Thomas Arendsen Hein tests: check for (/sec) instead of (B/sec) to match (X bytes/sec)...	r14023	transferred * bytes in * seconds (*/sec) (glob)
Durham Goode clone: fix copying bookmarks in uncompressed clones (issue4430)...	r23116	searching for changes
		no changes found
Matt Mackall tests: unify test-http-proxy	r12449	updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd b
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions
		$ cd ..

		url for proxy, pull

		$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd b-pull
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions
		$ cd ..

		host:port for proxy

		$ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		proxy url with user name and password

		$ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		url with user name and password

		$ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		bad host:port for proxy

		$ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
		abort: error: Connection refused
		[255]

		do not use the proxy if it is in the no list

		$ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cat proxy.log
Mads Kiilerich tests: reintroduce ":$HGPORT" in test output...	r12643	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Tomasz Kleczek branchcache: fetch source branchcache during clone (issue3378)...	r17740	* - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob)
Mads Kiilerich tests: reintroduce ":$HGPORT" in test output...	r12643	* - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob)
Durham Goode clone: fix copying bookmarks in uncompressed clones (issue4430)...	r23116	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob)
Mike Hommey bundle2: properly request phases during getbundle...	r29064	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
Pierre-Yves David test: use bundle2 in test-http-proxy...	r25371	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
		* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Mike Hommey bundle2: properly request phases during getbundle...	r29064	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
Matt Mackall bookmarks: merge low-level push/pull support into core	r13364	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Peter Arrenbrecht setdiscovery: batch heads and known(ownheads)...	r14624	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Mike Hommey bundle2: properly request phases during getbundle...	r29064	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
Matt Mackall bookmarks: merge low-level push/pull support into core	r13364	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Peter Arrenbrecht setdiscovery: batch heads and known(ownheads)...	r14624	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Mike Hommey bundle2: properly request phases during getbundle...	r29064	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)
Matt Mackall bookmarks: merge low-level push/pull support into core	r13364	* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
Peter Arrenbrecht setdiscovery: batch heads and known(ownheads)...	r14624	* - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
Mike Hommey bundle2: properly request phases during getbundle...	r29064	* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob)