This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10790

censor: drop size limitation on the tombstone
ClosedPublic

Authored by marmoute on May 28 2021, 6:57 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8089d0fa8400: censor: drop size limitation on the tombstone
Summary

This limitation seems to date back from a previous implementation of censors,
were the revision were censored" in place. For a long while the implementation
actually involved rewriting the revlog before replacing the original data. So it looks like we can safely remove this limitation.

The tests suite agrees.

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

marmoute created this revision.May 28 2021, 6:57 PM
baymax updated this revision to Diff 28252.May 29 2021, 12:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28255.May 30 2021, 12:07 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28303.May 31 2021, 6:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision as: Alphare.May 31 2021, 10:34 AM
baymax updated this revision to Diff 28318.May 31 2021, 4:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28400.Jun 1 2021, 11:17 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28415.Jun 2 2021, 7:43 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28449.Jun 4 2021, 11:05 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28471.Jun 7 2021, 5:16 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG8089d0fa8400: censor: drop size limitation on the tombstone.Jun 7 2021, 5:23 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8089d0fa8400: censor: drop size limitation on the tombstone (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/censor.py (5 lines)
Mtests/test-censor.t (6 lines)

Diff 28493

mercurial/revlogutils/censor.py

assert rl._format_version == constants.REVLOGV1, rl._format_version assert rl._format_version == constants.REVLOGV1, rl._format_version
# avoid cycle # avoid cycle
from .. import revlog from .. import revlog
censorrev = rl.rev(censornode) censorrev = rl.rev(censornode)
tombstone = storageutil.packmeta({b'censored': tombstone}, b'') tombstone = storageutil.packmeta({b'censored': tombstone}, b'')
if len(tombstone) > rl.rawsize(censorrev):
raise error.Abort(
_(b'censor tombstone must be no longer than censored data')
)
# Rewriting the revlog in place is hard. Our strategy for censoring is # Rewriting the revlog in place is hard. Our strategy for censoring is
# to create a new revlog, copy all revisions to it, then replace the # to create a new revlog, copy all revisions to it, then replace the
# revlogs on transaction close. # revlogs on transaction close.
# #
# This is a bit dangerous. We could easily have a mismatch of state. # This is a bit dangerous. We could easily have a mismatch of state.
newrl = revlog.revlog( newrl = revlog.revlog(
rl.opener, rl.opener,
target=rl.target, target=rl.target,

tests/test-censor.t

Passwords: hunter2 Passwords: hunter2
hunter3 hunter3
$ hg cat -r $C1 target | head -n 10 $ hg cat -r $C1 target | head -n 10
Tainted file Tainted file
Passwords: hunter2 Passwords: hunter2
$ hg cat -r 0 target | head -n 10 $ hg cat -r 0 target | head -n 10
Initially untainted file Initially untainted file
Try to censor revision with too large of a tombstone message
$ hg censor -r $C1 -t 'blah blah blah blah blah blah blah blah bla' target
abort: censor tombstone must be no longer than censored data
[255]
Censor revision with 2 offenses Censor revision with 2 offenses
(this also tests file pattern matching: path relative to cwd case) (this also tests file pattern matching: path relative to cwd case)
$ mkdir -p foo/bar/baz $ mkdir -p foo/bar/baz
$ hg --cwd foo/bar/baz censor -r $C2 -t "remove password" ../../../target $ hg --cwd foo/bar/baz censor -r $C2 -t "remove password" ../../../target
$ hg cat -r $H1 target | head -n 10 $ hg cat -r $H1 target | head -n 10
Tainted file is now sanitized Tainted file is now sanitized