fix: prevent zip-slip in backup restore via canonical path validation#2463
Open
PrivateBasicsApp wants to merge 2 commits intoHeliBorg:mainfrom
Open
fix: prevent zip-slip in backup restore via canonical path validation#2463PrivateBasicsApp wants to merge 2 commits intoHeliBorg:mainfrom
PrivateBasicsApp wants to merge 2 commits intoHeliBorg:mainfrom
Conversation
Collaborator
|
Thanks! How did you find this? Is there some bug that made you check the code? |
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.
The backup restore flow accepted relaxed layout filenames (matched against
layouts/custom.+\..{0,4}) without validating the ZIP entry name against the target directory. This allowed path traversal in ZIP entry names, enabling zip-slip overwrites of arbitrary files under the app's files directory.A malicious backup could exploit this to overwrite sensitive files such as
libjni_latinime.so, which when combined with restored checksum preferences could lead to native code execution on the next keyboard load.Changes
Added a safe extraction helper
restoreEntryToDir(zip: ZipInputStream, baseDir: File, entryName: String): Booleanthat:Resolves both
baseDirand the target file path canonically before writingRejects any entry whose canonical path falls outside baseDir
Logs and skips unsafe entries instead of writing them
Replaced direct
File(baseDir, entryName)writes in the restore loop with calls to this helper.Changes are localized to
BackupRestorePreference.ktand preserve existing behavior for database and preferences entries.