upstream/mercurial-mirror Files · tests/test-excessive-merge.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.

Bryan O'Sullivan - - Load All Authors

File last commit:

r17132:b87acfda default


                r29560:303e9300

default

Download file

             test-excessive-merge.t
        
                    101 lines
            
             | 3.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-excessive-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo foo > a

        $ echo foo > b

        $ hg add a b

        $ hg ci -m "test"

        $ echo blah > a

        $ hg ci -m "branch a"

        $ hg co 0

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

        $ echo blah > b

        $ hg ci -m "branch b"

        created new head

        $ HGMERGE=true hg merge 1

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

        (branch merge, don't forget to commit)

        $ hg ci -m "merge b/a -> blah"

        $ hg co 1

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

        $ HGMERGE=true hg merge 2

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

        (branch merge, don't forget to commit)

        $ hg ci -m "merge a/b -> blah"

        created new head

        $ hg log

        changeset:   4:2ee31f665a86

        tag:         tip

        parent:      1:96155394af80

        parent:      2:92cc4c306b19

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     merge a/b -> blah

        changeset:   3:e16a66a37edd

        parent:      2:92cc4c306b19

        parent:      1:96155394af80

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     merge b/a -> blah

        changeset:   2:92cc4c306b19

        parent:      0:5e0375449e74

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     branch b

        changeset:   1:96155394af80

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     branch a

        changeset:   0:5e0375449e74

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     test

        $ hg debugindex --changelog

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      60  .....       0 5e0375449e74 000000000000 000000000000 (re)

             1        60      62  .....       1 96155394af80 5e0375449e74 000000000000 (re)

             2       122      62  .....       2 92cc4c306b19 5e0375449e74 000000000000 (re)

             3       184      69  .....       3 e16a66a37edd 92cc4c306b19 96155394af80 (re)

             4       253      29  .....       4 2ee31f665a86 96155394af80 92cc4c306b19 (re)

      revision 1

        $ hg manifest --debug 1

        79d7492df40aa0fa093ec4209be78043c181f094 644   a

        2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   b

      revision 2

        $ hg manifest --debug 2

        2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   a

        79d7492df40aa0fa093ec4209be78043c181f094 644   b

      revision 3

        $ hg manifest --debug 3

        79d7492df40aa0fa093ec4209be78043c181f094 644   a

        79d7492df40aa0fa093ec4209be78043c181f094 644   b

      revision 4

        $ hg manifest --debug 4

        79d7492df40aa0fa093ec4209be78043c181f094 644   a

        79d7492df40aa0fa093ec4209be78043c181f094 644   b

        $ hg debugindex a

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       5  .....       0 2ed2a3912a0b 000000000000 000000000000 (re)

             1         5       6  .....       1 79d7492df40a 2ed2a3912a0b 000000000000 (re)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 5 changesets, 4 total revisions

	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

				$ hg init

				$ echo foo > a
				$ echo foo > b
				$ hg add a b

				$ hg ci -m "test"

				$ echo blah > a

				$ hg ci -m "branch a"

				$ hg co 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo blah > b

				$ hg ci -m "branch b"
				created new head
				$ HGMERGE=true hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg ci -m "merge b/a -> blah"

				$ hg co 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ HGMERGE=true hg merge 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -m "merge a/b -> blah"
				created new head

				$ hg log
				changeset: 4:2ee31f665a86
				tag: tip
				parent: 1:96155394af80
				parent: 2:92cc4c306b19
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: merge a/b -> blah

				changeset: 3:e16a66a37edd
				parent: 2:92cc4c306b19
				parent: 1:96155394af80
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: merge b/a -> blah

				changeset: 2:92cc4c306b19
				parent: 0:5e0375449e74
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: branch b

				changeset: 1:96155394af80
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: branch a

				changeset: 0:5e0375449e74
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: test

				$ hg debugindex --changelog
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 60 ..... 0 5e0375449e74 000000000000 000000000000 (re)
				1 60 62 ..... 1 96155394af80 5e0375449e74 000000000000 (re)
				2 122 62 ..... 2 92cc4c306b19 5e0375449e74 000000000000 (re)
				3 184 69 ..... 3 e16a66a37edd 92cc4c306b19 96155394af80 (re)
				4 253 29 ..... 4 2ee31f665a86 96155394af80 92cc4c306b19 (re)

				revision 1
				$ hg manifest --debug 1
				79d7492df40aa0fa093ec4209be78043c181f094 644 a
				2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
				revision 2
				$ hg manifest --debug 2
				2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
				79d7492df40aa0fa093ec4209be78043c181f094 644 b
				revision 3
				$ hg manifest --debug 3
				79d7492df40aa0fa093ec4209be78043c181f094 644 a
				79d7492df40aa0fa093ec4209be78043c181f094 644 b
				revision 4
				$ hg manifest --debug 4
				79d7492df40aa0fa093ec4209be78043c181f094 644 a
				79d7492df40aa0fa093ec4209be78043c181f094 644 b

				$ hg debugindex a
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
				1 5 6 ..... 1 79d7492df40a 2ed2a3912a0b 000000000000 (re)

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				2 files, 5 changesets, 4 total revisions