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

Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default


                r29560:303e9300

default

Download file

             test-import-eol.t
        
                    146 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-eol.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > makepatch.py <<EOF

        > f = file('eol.diff', 'wb')

        > w = f.write

        > w('test message\n')

        > w('diff --git a/a b/a\n')

        > w('--- a/a\n')

        > w('+++ b/a\n')

        > w('@@ -1,5 +1,5 @@\n')

        > w(' a\n')

        > w('-bbb\r\n')

        > w('+yyyy\r\n')

        > w(' cc\r\n')

        > w(' \n')

        > w(' d\n')

        > w('-e\n')

        > w('\ No newline at end of file\n')

        > w('+z\r\n')

        > w('\ No newline at end of file\r\n')

        > EOF

        $ hg init repo

        $ cd repo

        $ echo '\.diff' > .hgignore

      Test different --eol values

        $ $PYTHON -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")'

        $ hg ci -Am adda

        adding .hgignore

        adding a

        $ python ../makepatch.py

      invalid eol

        $ hg --config patch.eol='LFCR' import eol.diff

        applying eol.diff

        abort: unsupported line endings type: LFCR

        [255]

        $ hg revert -a

      force LF

        $ hg --traceback --config patch.eol='LF' import eol.diff

        applying eol.diff

        $ cat a

        a

        yyyy

        cc

        d

        e (no-eol)

        $ hg st

      force CRLF

        $ hg up -C 0

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

        $ hg --traceback --config patch.eol='CRLF' import eol.diff

        applying eol.diff

        $ cat a

        a\r (esc)

        yyyy\r (esc)

        cc\r (esc)

        \r (esc)

        d\r (esc)

        e (no-eol)

        $ hg st

      auto EOL on LF file

        $ hg up -C 0

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

        $ hg --traceback --config patch.eol='auto' import eol.diff

        applying eol.diff

        $ cat a

        a

        yyyy

        cc

        d

        e (no-eol)

        $ hg st

      auto EOL on CRLF file

        $ $PYTHON -c 'file("a", "wb").write("a\r\nbbb\r\ncc\r\n\r\nd\r\ne")'

        $ hg commit -m 'switch EOLs in a'

        $ hg --traceback --config patch.eol='auto' import eol.diff

        applying eol.diff

        $ cat a

        a\r (esc)

        yyyy\r (esc)

        cc\r (esc)

        \r (esc)

        d\r (esc)

        e (no-eol)

        $ hg st

      auto EOL on new file or source without any EOL

        $ $PYTHON -c 'file("noeol", "wb").write("noeol")'

        $ hg add noeol

        $ hg commit -m 'add noeol'

        $ $PYTHON -c 'file("noeol", "wb").write("noeol\r\nnoeol\n")'

        $ $PYTHON -c 'file("neweol", "wb").write("neweol\nneweol\r\n")'

        $ hg add neweol

        $ hg diff --git > noeol.diff

        $ hg revert --no-backup noeol neweol

        $ rm neweol

        $ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff

        applying noeol.diff

        $ cat noeol

        noeol\r (esc)

        noeol

        $ cat neweol

        neweol

        neweol\r (esc)

        $ hg st

      Test --eol and binary patches

        $ $PYTHON -c 'file("b", "wb").write("a\x00\nb\r\nd")'

        $ hg ci -Am addb

        adding b

        $ $PYTHON -c 'file("b", "wb").write("a\x00\nc\r\nd")'

        $ hg diff --git > bin.diff

        $ hg revert --no-backup b

      binary patch with --eol

        $ hg import --config patch.eol='CRLF' -m changeb bin.diff

        applying bin.diff

        $ cat b

        a\x00 (esc)

        c\r (esc)

        d (no-eol)

        $ hg st

        $ cd ..

	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

				$ cat > makepatch.py <<EOF
				> f = file('eol.diff', 'wb')
				> w = f.write
				> w('test message\n')
				> w('diff --git a/a b/a\n')
				> w('--- a/a\n')
				> w('+++ b/a\n')
				> w('@@ -1,5 +1,5 @@\n')
				> w(' a\n')
				> w('-bbb\r\n')
				> w('+yyyy\r\n')
				> w(' cc\r\n')
				> w(' \n')
				> w(' d\n')
				> w('-e\n')
				> w('\ No newline at end of file\n')
				> w('+z\r\n')
				> w('\ No newline at end of file\r\n')
				> EOF

				$ hg init repo
				$ cd repo
				$ echo '\.diff' > .hgignore


				Test different --eol values

				$ $PYTHON -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")'
				$ hg ci -Am adda
				adding .hgignore
				adding a
				$ python ../makepatch.py


				invalid eol

				$ hg --config patch.eol='LFCR' import eol.diff
				applying eol.diff
				abort: unsupported line endings type: LFCR
				[255]
				$ hg revert -a


				force LF

				$ hg --traceback --config patch.eol='LF' import eol.diff
				applying eol.diff
				$ cat a
				a
				yyyy
				cc

				d
				e (no-eol)
				$ hg st


				force CRLF

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg --traceback --config patch.eol='CRLF' import eol.diff
				applying eol.diff
				$ cat a
				a\r (esc)
				yyyy\r (esc)
				cc\r (esc)
				\r (esc)
				d\r (esc)
				e (no-eol)
				$ hg st


				auto EOL on LF file

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg --traceback --config patch.eol='auto' import eol.diff
				applying eol.diff
				$ cat a
				a
				yyyy
				cc

				d
				e (no-eol)
				$ hg st


				auto EOL on CRLF file

				$ $PYTHON -c 'file("a", "wb").write("a\r\nbbb\r\ncc\r\n\r\nd\r\ne")'
				$ hg commit -m 'switch EOLs in a'
				$ hg --traceback --config patch.eol='auto' import eol.diff
				applying eol.diff
				$ cat a
				a\r (esc)
				yyyy\r (esc)
				cc\r (esc)
				\r (esc)
				d\r (esc)
				e (no-eol)
				$ hg st


				auto EOL on new file or source without any EOL

				$ $PYTHON -c 'file("noeol", "wb").write("noeol")'
				$ hg add noeol
				$ hg commit -m 'add noeol'
				$ $PYTHON -c 'file("noeol", "wb").write("noeol\r\nnoeol\n")'
				$ $PYTHON -c 'file("neweol", "wb").write("neweol\nneweol\r\n")'
				$ hg add neweol
				$ hg diff --git > noeol.diff
				$ hg revert --no-backup noeol neweol
				$ rm neweol
				$ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff
				applying noeol.diff
				$ cat noeol
				noeol\r (esc)
				noeol
				$ cat neweol
				neweol
				neweol\r (esc)
				$ hg st


				Test --eol and binary patches

				$ $PYTHON -c 'file("b", "wb").write("a\x00\nb\r\nd")'
				$ hg ci -Am addb
				adding b
				$ $PYTHON -c 'file("b", "wb").write("a\x00\nc\r\nd")'
				$ hg diff --git > bin.diff
				$ hg revert --no-backup b

				binary patch with --eol

				$ hg import --config patch.eol='CRLF' -m changeb bin.diff
				applying bin.diff
				$ cat b
				a\x00 (esc)
				c\r (esc)
				d (no-eol)
				$ hg st
				$ cd ..