This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10905

stream: double check that self.vfs is *not* in the vfsmap
ClosedPublic

Authored by marmoute on Jun 24 2021, 3:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG65c519661991: stream: double check that self.vfs is *not* in the vfsmap
rHGadb9d79a4be4: stream: double check that self.vfs is *not* in the vfsmap
Summary

The stream clone logic allows for writing any content to any file under various
vfs. This is *not* suitable for *vfs*, since writing in .hg/ directly allow to
modify the configuration and is a great and simple gateway for remote code
execution.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (12 lines)

Diff 28718

mercurial/streamclone.py

assert repo.vfs not in vfsmap.values() assert repo.vfs not in vfsmap.values()
return vfsmap return vfsmap
def _emit2(repo, entries, totalfilesize): def _emit2(repo, entries, totalfilesize):
"""actually emit the stream bundle""" """actually emit the stream bundle"""
vfsmap = _makemap(repo) vfsmap = _makemap(repo)
# we keep repo.vfs out of the on purpose, ther are too many danger there
# (eg: .hg/hgrc),
#
# this assert is duplicated (from _makemap) as author might think this is
# fine, while this is really not fine.
assert repo.vfs not in vfsmap.values()
progress = repo.ui.makeprogress( progress = repo.ui.makeprogress(
_(b'bundle'), total=totalfilesize, unit=_(b'bytes') _(b'bundle'), total=totalfilesize, unit=_(b'bytes')
) )
progress.update(0) progress.update(0)
with maketempcopies() as copy, progress: with maketempcopies() as copy, progress:
# copy is delayed until we are in the try # copy is delayed until we are in the try
entries = [_filterfull(e, copy, vfsmap) for e in entries] entries = [_filterfull(e, copy, vfsmap) for e in entries]
yield None # this release the lock on the repository yield None # this release the lock on the repository
start = util.timer() start = util.timer()
progress = repo.ui.makeprogress( progress = repo.ui.makeprogress(
_(b'clone'), total=filesize, unit=_(b'bytes') _(b'clone'), total=filesize, unit=_(b'bytes')
) )
progress.update(0) progress.update(0)
vfsmap = _makemap(repo) vfsmap = _makemap(repo)
# we keep repo.vfs out of the on purpose, ther are too many danger
# there (eg: .hg/hgrc),
#
# this assert is duplicated (from _makemap) as author might think this
# is fine, while this is really not fine.
assert repo.vfs not in vfsmap.values()
with repo.transaction(b'clone'): with repo.transaction(b'clone'):
ctxs = (vfs.backgroundclosing(repo.ui) for vfs in vfsmap.values()) ctxs = (vfs.backgroundclosing(repo.ui) for vfs in vfsmap.values())
with nested(*ctxs): with nested(*ctxs):
for i in range(filecount): for i in range(filecount):
src = util.readexactly(fp, 1) src = util.readexactly(fp, 1)
vfs = vfsmap[src] vfs = vfsmap[src]
namelen = util.uvarintdecodestream(fp) namelen = util.uvarintdecodestream(fp)