Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 28658:34d43cb85de8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC) CVE-2016-3068 (1/1) Git's git-remote-ext remote helper provides an ext:: URL scheme that allows running arbitrary shell commands. This feature allows implementing simple git smart transports with a single shell shell command. However, git submodules could clone arbitrary URLs specified in the .gitmodules file. This was reported as CVE-2015-7545 and fixed in git v2.6.1. However, if a user directly clones a malicious ext URL, the git client will still run arbitrary shell commands. Mercurial is similarly effected. Mercurial allows specifying git repositories as subrepositories. Git ext:: URLs can be specified as Mercurial subrepositories allowing arbitrary shell commands to be run on `hg clone ...`. The Mercurial community would like to thank Blake Burkhart for reporting this issue. The description of the issue is copied from Blake's report. This commit changes submodules to pass the GIT_ALLOW_PROTOCOL env variable to git commands with the same list of allowed protocols that git submodule is using. When the GIT_ALLOW_PROTOCOL env variable is already set, we just pass it to git without modifications.
author Mateusz Kwapich <mitrandir@fb.com>
date Sun, 20 Mar 2016 21:52:21 -0700
parents 7dab4caf11bc
children ff0d3b6b287f
comparison
equal deleted inserted replaced
28657:b9714d958e89 28658:34d43cb85de8
1381 1381
1382 The methods tries to call the git command. versions prior to 1.6.0 1382 The methods tries to call the git command. versions prior to 1.6.0
1383 are not supported and very probably fail. 1383 are not supported and very probably fail.
1384 """ 1384 """
1385 self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands))) 1385 self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands)))
1386 if env is None:
1387 env = os.environ.copy()
1388 # fix for Git CVE-2015-7545
1389 if 'GIT_ALLOW_PROTOCOL' not in env:
1390 env['GIT_ALLOW_PROTOCOL'] = 'file:git:http:https:ssh'
1386 # unless ui.quiet is set, print git's stderr, 1391 # unless ui.quiet is set, print git's stderr,
1387 # which is mostly progress and useful info 1392 # which is mostly progress and useful info
1388 errpipe = None 1393 errpipe = None
1389 if self.ui.quiet: 1394 if self.ui.quiet:
1390 errpipe = open(os.devnull, 'w') 1395 errpipe = open(os.devnull, 'w')