This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6845

pushkeys: introduce a server.bookmarks-pushkey-reject option to complement D6776
Needs RevisionPublic

Authored by idlsoft on Sep 12 2019, 12:48 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

idlsoft created this revision.Sep 12 2019, 12:48 PM
baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM

Revision Contents
Changeset List

Diff 16523

mercurial/bookmarks.py

def listbookmarks(repo): def listbookmarks(repo):
d = {} d = {}
for book, node in listbinbookmarks(repo): for book, node in listbinbookmarks(repo):
d[book] = hex(node) d[book] = hex(node)
return d return d
def pushbookmark(repo, key, old, new): def pushbookmark(repo, key, old, new):
if repo.ui.configbool('server', 'bookmarks-pushkey-reject'):
return False
if bookmarksinstore(repo): if bookmarksinstore(repo):
wlock = util.nullcontextmanager() wlock = util.nullcontextmanager()
else: else:
wlock = repo.wlock() wlock = repo.wlock()
with wlock, repo.lock(), repo.transaction('bookmarks') as tr: with wlock, repo.lock(), repo.transaction('bookmarks') as tr:
marks = repo._bookmarks marks = repo._bookmarks
existing = hex(marks.get(key, '')) existing = hex(marks.get(key, ''))
if existing != old and existing != new: if existing != old and existing != new:

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem('storage', 'revlog.zstd.level', coreconfigitem('storage', 'revlog.zstd.level',
default=None, default=None,
) )
coreconfigitem('server', 'bookmarks-pushkey-compat', coreconfigitem('server', 'bookmarks-pushkey-compat',
default=True, default=True,
) )
coreconfigitem('server', 'bookmarks-pushkey-reject',
default=False,
)
coreconfigitem('server', 'bundle1', coreconfigitem('server', 'bundle1',
default=True, default=True,
) )
coreconfigitem('server', 'bundle1gd', coreconfigitem('server', 'bundle1gd',
default=None, default=None,
) )
coreconfigitem('server', 'bundle1.pull', coreconfigitem('server', 'bundle1.pull',
default=None, default=None,

tests/test-bookmarks-pushpull.t

Pushing the bookmark "foo" now fails as it contains a secret changeset Pushing the bookmark "foo" now fails as it contains a secret changeset
$ hg push -r foo $ hg push -r foo
pushing to $TESTTMP/issue6159remote pushing to $TESTTMP/issue6159remote
searching for changes searching for changes
no changes found (ignored 1 secret changesets) no changes found (ignored 1 secret changesets)
abort: cannot push bookmark foo as it points to a secret changeset abort: cannot push bookmark foo as it points to a secret changeset
[255] [255]
Should fail to push a bookmark if server.bookmarks-pushkey-reject=true
$ hg init pb_server
$ cat << EOF >> pb_server/.hg/hgrc
> [server]
> bookmarks-pushkey-reject = true
> [web]
> push_ssl = false
> allow_push = *
> EOF
$ echo a > pb_server/a
$ hg --cwd pb_server add a
$ hg -R pb_server commit -m "Initial commit"
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
$ hg serve -R pb_server -p $HGPORT --pid-file=pb_server.pid -d
$ cat pb_server.pid >> $DAEMON_PIDS
$ hg clone -q http://localhost:$HGPORT/ pb_copy
$ hg -R pb_copy book book1
$ hg -R pb_copy push -B book1 --config devel.legacy.exchange=bookmarks
pushing to http://localhost:$HGPORT/
searching for changes
no changes found
abort: exporting bookmark book1 failed!
[255]
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS