upstream/mercurial-mirror Files · tests/test-unionrepo.t

sslutil: require TLS 1.1+ when supported...

sslutil: require TLS 1.1+ when supported Currently, Mercurial will use TLS 1.0 or newer when connecting to remote servers, selecting the highest TLS version supported by both peers. On older Pythons, only TLS 1.0 is available. On newer Pythons, TLS 1.1 and 1.2 should be available. Security professionals recommend avoiding TLS 1.0 if possible. PCI DSS 3.1 "strongly encourages" the use of TLS 1.2. Known attacks like BEAST and POODLE exist against TLS 1.0 (although mitigations are available and properly configured servers aren't vulnerable). I asked Eric Rescorla - Mozilla's resident crypto expert - whether Mercurial should drop support for TLS 1.0. His response was "if you can get away with it." Essentially, a number of servers on the Internet don't support TLS 1.1+. This is why web browsers continue to support TLS 1.0 despite desires from security experts. This patch changes Mercurial's default behavior on modern Python versions to require TLS 1.1+, thus avoiding known security issues with TLS 1.0 and making Mercurial more secure by default. Rather than drop TLS 1.0 support wholesale, we still allow TLS 1.0 to be used if configured. This is a compromise solution - ideally we'd disallow TLS 1.0. However, since we're not sure how many Mercurial servers don't support TLS 1.1+ and we're not sure how much user inconvenience this change will bring, I think it is prudent to ship an escape hatch that still allows usage of TLS 1.0. In the default case our users get better security. In the worst case, they are no worse off than before this patch. This patch has no effect when running on Python versions that don't support TLS 1.1+. As the added test shows, connecting to a server that doesn't support TLS 1.1+ will display a warning message with a link to our wiki, where we can guide people to configure their client to allow less secure connections.

Sean Farley - - Load All Authors

File last commit:

r27723:bf86e3e8 stable


                r29560:303e9300

default

Download file

             test-unionrepo.t
        
                    169 lines
            
             | 3.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-unionrepo.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
unionrepo: read-only operations on a union of two localrepos...

              r18944
            
      Test unionrepo functionality

      Create one repository

        $ hg init repo1

        $ cd repo1

        $ touch repo1-0

        $ echo repo1-0 > f

        $ hg ci -Aqmrepo1-0

        $ touch repo1-1

        $ echo repo1-1 >> f

        $ hg ci -Aqmrepo1-1

        $ touch repo1-2

        $ echo repo1-2 >> f

        $ hg ci -Aqmrepo1-2

        $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'

        2:68c0685446a3  repo1-2

        1:8a58db72e69d  repo1-1

        0:f093fec0529b  repo1-0

        $ tip1=`hg id -q`

        $ cd ..

      - and a clone with a not-completely-trivial history

        $ hg clone -q repo1 --rev 0 repo2

        $ cd repo2

        $ touch repo2-1

        Kevin Bullock
    
check-code: expand sed rule to include more offenders...

              r19081
            
        $ sed '1i\

        Kevin Bullock
    
tests: make sed usage in test-unionrepo.t cross-platform...

              r19084
            
        > repo2-1 at top

        > ' f > f.tmp

        Mads Kiilerich
    
unionrepo: read-only operations on a union of two localrepos...

              r18944
            
        $ mv f.tmp f

        $ hg ci -Aqmrepo2-1

        $ touch repo2-2

        $ hg pull -q ../repo1 -r 1

        $ hg merge -q

        $ hg ci -Aqmrepo2-2-merge

        $ touch repo2-3

        $ echo repo2-3 >> f

        $ hg ci -mrepo2-3

        $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'

        4:2f0d178c469c  repo2-3

        3:9e6fb3e0b9da  repo2-2-merge

        2:8a58db72e69d  repo1-1

        1:c337dba826e7  repo2-1

        0:f093fec0529b  repo1-0

        $ cd ..

      revisions from repo2 appear as appended / pulled to repo1

        $ hg -R union:repo1+repo2 log --template '{rev}:{node|short}  {desc|firstline}\n'

        5:2f0d178c469c  repo2-3

        4:9e6fb3e0b9da  repo2-2-merge

        3:c337dba826e7  repo2-1

        2:68c0685446a3  repo1-2

        1:8a58db72e69d  repo1-1

        0:f093fec0529b  repo1-0

      manifest can be retrieved for revisions in both repos

        $ hg -R union:repo1+repo2 mani -r $tip1

        f

        repo1-0

        repo1-1

        repo1-2

        $ hg -R union:repo1+repo2 mani -r 4

        f

        repo1-0

        repo1-1

        repo2-1

        repo2-2

      files can be retrieved form both repos

        $ hg -R repo1 cat repo1/f -r2

        repo1-0

        repo1-1

        repo1-2

        $ hg -R union:repo1+repo2 cat -r$tip1 repo1/f

        repo1-0

        repo1-1

        repo1-2

        $ hg -R union:repo1+repo2 cat -r4 $TESTTMP/repo1/f

        repo2-1 at top

        repo1-0

        repo1-1

      files can be compared across repos

        $ hg -R union:repo1+repo2 diff -r$tip1 -rtip

        diff -r 68c0685446a3 -r 2f0d178c469c f

        --- a/f	Thu Jan 01 00:00:00 1970 +0000

        +++ b/f	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,3 +1,4 @@

        +repo2-1 at top

         repo1-0

         repo1-1

        -repo1-2

        +repo2-3

      heads from both repos are found correctly

        $ hg -R union:repo1+repo2 heads --template '{rev}:{node|short}  {desc|firstline}\n'

        5:2f0d178c469c  repo2-3

        2:68c0685446a3  repo1-2

      revsets works across repos

        $ hg -R union:repo1+repo2 id -r "ancestor($tip1, 5)"

        8a58db72e69d

      annotate works - an indication that linkrevs works

        Matt Mackall
    
tests: fix unionrepo path issue on msys (issue3927)

              r19164
            
        $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip

        Mads Kiilerich
    
unionrepo: read-only operations on a union of two localrepos...

              r18944
            
        3: repo2-1 at top

        0: repo1-0

        1: repo1-1

        5: repo2-3

      union repos can be cloned ... and clones works correctly

        $ hg clone -U union:repo1+repo2 repo3

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 6 changesets with 11 changes to 6 files (+1 heads)

        $ hg -R repo3 paths

        default = union:repo1+repo2

        $ hg -R repo3 verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        6 files, 6 changesets, 11 total revisions

        $ hg -R repo3 heads --template '{rev}:{node|short}  {desc|firstline}\n'

        5:2f0d178c469c  repo2-3

        2:68c0685446a3  repo1-2

        $ hg -R repo3 log --template '{rev}:{node|short}  {desc|firstline}\n'

        5:2f0d178c469c  repo2-3

        4:9e6fb3e0b9da  repo2-2-merge

        3:c337dba826e7  repo2-1

        2:68c0685446a3  repo1-2

        1:8a58db72e69d  repo1-1

        0:f093fec0529b  repo1-0

        Sean Farley
    
unionrepo: fix wrong rev being checked in iscensored (issue5024)

              r27723
            
      union repos should use the correct rev number (issue5024)

        $ hg init a

        $ cd a

        $ echo a0 >> f

        $ hg ci -Aqm a0

        $ cd ..

        $ hg init b

        $ cd b

        $ echo b0 >> f

        $ hg ci -Aqm b0

        $ echo b1 >> f

        $ hg ci -qm b1

        $ cd ..

      "hg files -v" to call fctx.size() -> fctx.iscensored()

        $ hg files -R union:b+a -r2 -v

                 3   b/f (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

Mads Kiilerich unionrepo: read-only operations on a union of two localrepos...	r18944	Test unionrepo functionality

		Create one repository

		$ hg init repo1
		$ cd repo1
		$ touch repo1-0
		$ echo repo1-0 > f
		$ hg ci -Aqmrepo1-0
		$ touch repo1-1
		$ echo repo1-1 >> f
		$ hg ci -Aqmrepo1-1
		$ touch repo1-2
		$ echo repo1-2 >> f
		$ hg ci -Aqmrepo1-2
		$ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
		2:68c0685446a3 repo1-2
		1:8a58db72e69d repo1-1
		0:f093fec0529b repo1-0
		$ tip1=`hg id -q`
		$ cd ..

		- and a clone with a not-completely-trivial history

		$ hg clone -q repo1 --rev 0 repo2
		$ cd repo2
		$ touch repo2-1
Kevin Bullock check-code: expand sed rule to include more offenders...	r19081	$ sed '1i\
Kevin Bullock tests: make sed usage in test-unionrepo.t cross-platform...	r19084	> repo2-1 at top
		> ' f > f.tmp
Mads Kiilerich unionrepo: read-only operations on a union of two localrepos...	r18944	$ mv f.tmp f
		$ hg ci -Aqmrepo2-1
		$ touch repo2-2
		$ hg pull -q ../repo1 -r 1
		$ hg merge -q
		$ hg ci -Aqmrepo2-2-merge
		$ touch repo2-3
		$ echo repo2-3 >> f
		$ hg ci -mrepo2-3
		$ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
		4:2f0d178c469c repo2-3
		3:9e6fb3e0b9da repo2-2-merge
		2:8a58db72e69d repo1-1
		1:c337dba826e7 repo2-1
		0:f093fec0529b repo1-0
		$ cd ..

		revisions from repo2 appear as appended / pulled to repo1

		$ hg -R union:repo1+repo2 log --template '{rev}:{node\|short} {desc\|firstline}\n'
		5:2f0d178c469c repo2-3
		4:9e6fb3e0b9da repo2-2-merge
		3:c337dba826e7 repo2-1
		2:68c0685446a3 repo1-2
		1:8a58db72e69d repo1-1
		0:f093fec0529b repo1-0

		manifest can be retrieved for revisions in both repos

		$ hg -R union:repo1+repo2 mani -r $tip1
		f
		repo1-0
		repo1-1
		repo1-2
		$ hg -R union:repo1+repo2 mani -r 4
		f
		repo1-0
		repo1-1
		repo2-1
		repo2-2

		files can be retrieved form both repos

		$ hg -R repo1 cat repo1/f -r2
		repo1-0
		repo1-1
		repo1-2

		$ hg -R union:repo1+repo2 cat -r$tip1 repo1/f
		repo1-0
		repo1-1
		repo1-2

		$ hg -R union:repo1+repo2 cat -r4 $TESTTMP/repo1/f
		repo2-1 at top
		repo1-0
		repo1-1

		files can be compared across repos

		$ hg -R union:repo1+repo2 diff -r$tip1 -rtip
		diff -r 68c0685446a3 -r 2f0d178c469c f
		--- a/f Thu Jan 01 00:00:00 1970 +0000
		+++ b/f Thu Jan 01 00:00:00 1970 +0000
		@@ -1,3 +1,4 @@
		+repo2-1 at top
		repo1-0
		repo1-1
		-repo1-2
		+repo2-3

		heads from both repos are found correctly

		$ hg -R union:repo1+repo2 heads --template '{rev}:{node\|short} {desc\|firstline}\n'
		5:2f0d178c469c repo2-3
		2:68c0685446a3 repo1-2

		revsets works across repos

		$ hg -R union:repo1+repo2 id -r "ancestor($tip1, 5)"
		8a58db72e69d

		annotate works - an indication that linkrevs works

Matt Mackall tests: fix unionrepo path issue on msys (issue3927)	r19164	$ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
Mads Kiilerich unionrepo: read-only operations on a union of two localrepos...	r18944	3: repo2-1 at top
		0: repo1-0
		1: repo1-1
		5: repo2-3

		union repos can be cloned ... and clones works correctly

		$ hg clone -U union:repo1+repo2 repo3
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 6 changesets with 11 changes to 6 files (+1 heads)

		$ hg -R repo3 paths
		default = union:repo1+repo2

		$ hg -R repo3 verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		6 files, 6 changesets, 11 total revisions

		$ hg -R repo3 heads --template '{rev}:{node\|short} {desc\|firstline}\n'
		5:2f0d178c469c repo2-3
		2:68c0685446a3 repo1-2

		$ hg -R repo3 log --template '{rev}:{node\|short} {desc\|firstline}\n'
		5:2f0d178c469c repo2-3
		4:9e6fb3e0b9da repo2-2-merge
		3:c337dba826e7 repo2-1
		2:68c0685446a3 repo1-2
		1:8a58db72e69d repo1-1
		0:f093fec0529b repo1-0
Sean Farley unionrepo: fix wrong rev being checked in iscensored (issue5024)	r27723
		union repos should use the correct rev number (issue5024)

		$ hg init a
		$ cd a
		$ echo a0 >> f
		$ hg ci -Aqm a0
		$ cd ..
		$ hg init b
		$ cd b
		$ echo b0 >> f
		$ hg ci -Aqm b0
		$ echo b1 >> f
		$ hg ci -qm b1
		$ cd ..

		"hg files -v" to call fctx.size() -> fctx.iscensored()
		$ hg files -R union:b+a -r2 -v
		3 b/f (glob)