( )⚙ D11259 subrepo: compare normalised vfs path

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11259

subrepo: compare normalised vfs path
ClosedPublic

Authored by marmoute on Aug 5 2021, 12:58 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG23921bc857b5: subrepo: compare normalised vfs path
rHG0bb4c97d8ac6: subrepo: compare normalised vfs path
rHG11c2bd973659: subrepo: compare normalised vfs path
Summary

Otherwise the realpath call can turn / into \ on windows confusing the
check.

(We probably needs this in more location)

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Aug 5 2021, 12:58 PM
baymax updated this revision to Diff 29819.Aug 5 2021, 2:01 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Alphare accepted this revision.Aug 6 2021, 6:20 AM
This revision is now accepted and ready to land.Aug 6 2021, 6:20 AM
marmoute added a commit: rHG11c2bd973659: subrepo: compare normalised vfs path.Aug 6 2021, 6:29 AM
Closed by commit rHG11c2bd973659: subrepo: compare normalised vfs path (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (6 lines)

Diff 29812

mercurial/subrepo.py

def __init__(self, ctx, path, state, allowcreate): def __init__(self, ctx, path, state, allowcreate):
super(hgsubrepo, self).__init__(ctx, path) super(hgsubrepo, self).__init__(ctx, path)
self._state = state self._state = state
r = ctx.repo() r = ctx.repo()
root = r.wjoin(util.localpath(path)) root = r.wjoin(util.localpath(path))
create = allowcreate and not r.wvfs.exists(b'%s/.hg' % path) create = allowcreate and not r.wvfs.exists(b'%s/.hg' % path)
# repository constructor does expand variables in path, which is # repository constructor does expand variables in path, which is
# unsafe since subrepo path might come from untrusted source. # unsafe since subrepo path might come from untrusted source.
if os.path.realpath(util.expandpath(root)) != root: norm_root = os.path.normcase(root)
real_root = os.path.normcase(os.path.realpath(util.expandpath(root)))
if real_root != norm_root:
raise error.Abort( raise error.Abort(
_(b'subrepo path contains illegal component: %s') % path _(b'subrepo path contains illegal component: %s') % path
) )
self._repo = hg.repository(r.baseui, root, create=create) self._repo = hg.repository(r.baseui, root, create=create)
if self._repo.root != root: if os.path.normcase(self._repo.root) != os.path.normcase(root):
raise error.ProgrammingError( raise error.ProgrammingError(
b'failed to reject unsafe subrepo ' b'failed to reject unsafe subrepo '
b'path: %s (expanded to %s)' % (root, self._repo.root) b'path: %s (expanded to %s)' % (root, self._repo.root)
) )
# Propagate the parent's --hidden option # Propagate the parent's --hidden option
if r is r.unfiltered(): if r is r.unfiltered():
self._repo = self._repo.unfiltered() self._repo = self._repo.unfiltered()