view tests/test-subrepo-missing.t @ 29560:303e9300772a

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.
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 13 Jul 2016 21:35:54 -0700
parents 92d37fb3f1aa
children a7f8939641aa
line wrap: on
line source

  $ hg init repo
  $ cd repo
  $ hg init subrepo
  $ echo a > subrepo/a
  $ hg -R subrepo ci -Am adda
  adding a
  $ echo 'subrepo = subrepo' > .hgsub
  $ hg ci -Am addsubrepo
  adding .hgsub
  $ echo b > subrepo/b
  $ hg -R subrepo ci -Am addb
  adding b
  $ hg ci -m updatedsub

ignore blanklines in .hgsubstate

  >>> file('.hgsubstate', 'wb').write('\n\n   \t \n   \n')
  $ hg st --subrepos
  M .hgsubstate
  $ hg revert -qC .hgsubstate

abort more gracefully on .hgsubstate parsing error

  $ cp .hgsubstate .hgsubstate.old
  >>> file('.hgsubstate', 'wb').write('\ninvalid')
  $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo
  abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2
  [255]
  $ mv .hgsubstate.old .hgsubstate

delete .hgsub and revert it

  $ rm .hgsub
  $ hg revert .hgsub
  warning: subrepo spec file '.hgsub' not found
  warning: subrepo spec file '.hgsub' not found
  warning: subrepo spec file '.hgsub' not found

delete .hgsubstate and revert it

  $ rm .hgsubstate
  $ hg revert .hgsubstate

delete .hgsub and update

  $ rm .hgsub
  $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
  warning: subrepo spec file 'repo/.hgsub' not found
  warning: subrepo spec file 'repo/.hgsub' not found
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg st
  warning: subrepo spec file '.hgsub' not found
  ! .hgsub
  $ ls subrepo
  a

delete .hgsubstate and update

  $ hg up -C
  warning: subrepo spec file '.hgsub' not found
  warning: subrepo spec file '.hgsub' not found
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm .hgsubstate
  $ hg up 0
  remote changed .hgsubstate which local deleted
  use (c)hanged version or leave (d)eleted? c
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg st
  $ ls subrepo
  a

Enable obsolete

  $ cat >> $HGRCPATH << EOF
  > [ui]
  > logtemplate= {rev}:{node|short} {desc|firstline}
  > [phases]
  > publish=False
  > [experimental]
  > evolution=createmarkers
  > EOF

check that we can update parent repo with missing (amended) subrepo revision

  $ hg up --repository subrepo -r tip
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg ci -m "updated subrepo to tip"
  created new head
  $ cd subrepo
  $ hg update -r tip
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo foo > a
  $ hg commit --amend -m "addb (amended)"
  $ cd ..
  $ hg update --clean .
  revision 102a90ea7b4a in subrepo subrepo is hidden
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

check that --hidden is propagated to the subrepo

  $ hg -R subrepo up tip
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg ci -m 'commit with amended subrepo'
  $ echo bar > subrepo/a
  $ hg -R subrepo ci --amend -m "amend a (again)"
  $ hg --hidden cat subrepo/a
  foo

verify will warn if locked-in subrepo revisions are hidden or missing

  $ hg ci -m "amended subrepo (again)"
  $ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip'
  $ hg verify
  checking changesets
  checking manifests
  crosschecking files in changesets and manifests
  checking files
  2 files, 5 changesets, 5 total revisions
  checking subrepo links
  subrepo 'subrepo' is hidden in revision a66de08943b6
  subrepo 'subrepo' is hidden in revision 674d05939c1e
  subrepo 'subrepo' not found in revision a7d05d9055a4

verifying shouldn't init a new subrepo if the reference doesn't exist

  $ mv subrepo b
  $ hg verify
  checking changesets
  checking manifests
  crosschecking files in changesets and manifests
  checking files
  2 files, 5 changesets, 5 total revisions
  checking subrepo links
  0: repository $TESTTMP/repo/subrepo not found (glob)
  1: repository $TESTTMP/repo/subrepo not found (glob)
  3: repository $TESTTMP/repo/subrepo not found (glob)
  4: repository $TESTTMP/repo/subrepo not found (glob)
  $ ls
  b
  $ mv b subrepo

  $ cd ..