This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10146

enclink: check contents of symlinks not just size in case of fcrypt
ClosedPublic

Authored by cschuhen on Mar 10 2021, 1:17 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0d055849d5f9: enclink: check contents of symlinks not just size in case of fcrypt
Summary

Check content of symlinks because st_size may indicate the size of encrypted
data which does not match actual link value.

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.

Event Timeline

cschuhen created this revision.Mar 10 2021, 1:17 AM
cschuhen added a comment.Mar 10 2021, 1:23 AM

This is a fixed version of D9965 relating to issue6456.

Alphare accepted this revision.Mar 15 2021, 7:47 AM
Alphare added a subscriber: Alphare.

This looks good, thanks!
Please abandon D9965 as well.

Alphare added a child revision: D10217: rust-status: fix issue6456 for the Rust implementation also.Mar 15 2021, 10:07 AM

BTW this should go to the stable branch!
I've sent my fix for the (existing) Rust implementation as a dependent diff.

cschuhen added a commit: rHG0d055849d5f9: enclink: check contents of symlinks not just size in case of fcrypt.Mar 15 2021, 1:13 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0d055849d5f9: enclink: check contents of symlinks not just size in case of fcrypt (authored by cschuhen). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (4 lines)
Mmercurial/dirstate.py (7 lines)

Diff 26366

mercurial/context.py

if self._repo._encodefilterpats: if self._repo._encodefilterpats:
# can't rely on size() because wdir content may be decoded # can't rely on size() because wdir content may be decoded
return self._filelog.cmp(self._filenode, fctx.data()) return self._filelog.cmp(self._filenode, fctx.data())
if self.size() - 4 == fctx.size(): if self.size() - 4 == fctx.size():
# size() can match: # size() can match:
# if file data starts with '\1\n', empty metadata block is # if file data starts with '\1\n', empty metadata block is
# prepended, which adds 4 bytes to filelog.size(). # prepended, which adds 4 bytes to filelog.size().
return self._filelog.cmp(self._filenode, fctx.data()) return self._filelog.cmp(self._filenode, fctx.data())
if self.size() == fctx.size(): if self.size() == fctx.size() or self.flags() == b'l':
# size() matches: need to compare content # size() matches: need to compare content
# issue6456: Always compare symlinks because size can represent
# encrypted string for EXT-4 encryption(fscrypt).
return self._filelog.cmp(self._filenode, fctx.data()) return self._filelog.cmp(self._filenode, fctx.data())
# size() differs # size() differs
return True return True
def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None): def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None):
"""return the first ancestor of <srcrev> introducing <fnode> """return the first ancestor of <srcrev> introducing <fnode>

mercurial/dirstate.py

size >= 0 size >= 0
and ( and (
(size != st.st_size and size != st.st_size & _rangemask) (size != st.st_size and size != st.st_size & _rangemask)
or ((mode ^ st.st_mode) & 0o100 and checkexec) or ((mode ^ st.st_mode) & 0o100 and checkexec)
) )
or size == -2 # other parent or size == -2 # other parent
or fn in copymap or fn in copymap
): ):
if (stat.S_ISLNK(st.st_mode) and size != st.st_size):
# issue6456: Size returned may be longer due to
# encryption on EXT-4 fscrypt, undecided.
ladd(fn)
else:
madd(fn) madd(fn)
elif ( elif (
time != st[stat.ST_MTIME] time != st[stat.ST_MTIME]
and time != st[stat.ST_MTIME] & _rangemask and time != st[stat.ST_MTIME] & _rangemask
): ):
ladd(fn) ladd(fn)
elif st[stat.ST_MTIME] == lastnormaltime: elif st[stat.ST_MTIME] == lastnormaltime:
# fn may have just been marked as normal and it may have # fn may have just been marked as normal and it may have
# changed in the same second without changing its size. # changed in the same second without changing its size.