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

Fix database merge issues #10452

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Fix database merge issues #10452

merged 2 commits into from
Apr 29, 2024

Commits on Apr 29, 2024

  1. Prevent KeeShare from merging database custom data 

    This issue previously caused parent databases to be marked as modified on unlock. This was because of the new protections against byte-by-byte side channel attacks adds a randomized string to the database custom data. We should never be merging database custom data with keeshare or imports since we are merging groups only.

Also prevent overwrite of auto-generated custom data fields, Last Modified and Random Slug.
    @droidmonkey
    droidmonkey committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e9b2a1c View commit details
    Browse the repository at this point in the history

  2. Preserve Secret Service exposed group setting on merge 

    * Fixes #9371 - adds secret service custom data key to the list of protected custom data (will not be overwritten on merge)
    @droidmonkey
    droidmonkey committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    ada78b7 View commit details
    Browse the repository at this point in the history