Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

T258401: Stop deleting important objects found in commits #128

Merged
merged 7 commits into from
Jun 7, 2024
Merged

T258401: Stop deleting important objects found in commits #128

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
487f9e8
T258401: First stage of securing against destructive commits, do not …
gandie Jun 3, 2024
409cd59
T258401: Fix typo, expect acl_users to be still present
gandie Jun 3, 2024
d6120da
T258401: Only protect top level acl_users, extend test case accordingly
gandie Jun 3, 2024
26d382c
T258401: Correct typo
gandie Jun 4, 2024
7e4b776
T258401: Also secure deletion for single object playback
gandie Jun 6, 2024
31ebf9e
T258401: Fix test and actually allow deletion of module's acl_users
Jun 7, 2024
641cbca
Also commit transaction for second test
Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions perfact/zodbsync/tests/test_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2023,3 +2023,20 @@ def test_layer_update(self):
self.run('layer-hash', layer)
self.run('layer-update', ident)
assert self.app.Test.title == 'Changed'

def test_keep_acl(self):
'''
Make sure deletions on acl_users are NOT synced into Data.fs
'''
acl_path = os.path.join(
self.repo.path,
'__root__',
'acl_users',
)
shutil.rmtree(acl_path)
self.run('playback', '/')

# this playback will fail horribly if acl_users is gone!
self.run('playback', '/')

assert 'acl_users' in self.app.objectIds()
5 changes: 4 additions & 1 deletion perfact/zodbsync/zodbsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,10 @@ def _playback_path(self, pathinfo):
srv_contents = obj_contents(obj) if obj else []

# Find IDs in Data.fs object not present in file system
del_ids = [a for a in srv_contents if a not in contents]
del_ids = [
a for a in srv_contents
if a not in contents and a != 'acl_users'
]
if del_ids:
self.logger.warning('Deleting objects ' + repr(del_ids))
obj.manage_delObjects(ids=del_ids)
Expand Down