refactor(backup): enhance backup system with legacy backup and path security#13587
Merged
kangfenmao merged 3 commits intomainfrom Mar 18, 2026
Merged
refactor(backup): enhance backup system with legacy backup and path security#13587kangfenmao merged 3 commits intomainfrom
kangfenmao merged 3 commits intomainfrom
Conversation
…ecurity - Implement direct backup and restore methods for IndexedDB and Local Storage - Add legacy backup (LAN transfer) functionality - Implement startup restoration support - Enhance path security with resolveAndValidatePath to prevent traversal attacks - Simplify BackupManager constructor and methods - Add Joplin and Siyuan icons - Update backup metadata structure and progress handling Signed-off-by: kangfenmao <[email protected]>
…inclusion - Change electron-store storage location from userData/config.json to userData/Data/config.json - Add migration function to automatically migrate config from legacy location - Add electron-store mock in test setup to avoid file system operations Signed-off-by: kangfenmao <[email protected]>
DeJeune
requested changes
Mar 18, 2026
Collaborator
DeJeune
left a comment
There was a problem hiding this comment.
Thanks for the refactor — the overall direction makes sense, but I found two runtime issues that should be addressed before merge: direct restore now overwrites active data directories without the previous resource cleanup/swap safeguards, and the LAN/file-export backup name only has minute-level precision, which can silently overwrite a backup created earlier in the same minute.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does
Before this PR:
After this PR:
resolveAndValidatePathto prevent directory traversal attacksFixes #
Why we need it and why it was done in this way
The following tradeoffs were made:
The following alternatives were considered:
Links to places where the discussion took place: N/A
Breaking changes
The backup format has been updated to a new version. Existing backups created with older versions will still be supported through the legacy backup functionality.
Special notes for your reviewer
resolveAndValidatePathutility prevents path traversal attacks by validating that resolved paths stay within expected directoriesuserData/config.jsontouserData/Data/config.jsonwith automatic migrationChecklist
This checklist is not enforcing, but it's a reminder of items that could be relevant to every PR.
Approvers are expected to review this list.
/gh-pr-review,gh pr diff, or GitHub UI) before requesting review from othersRelease note