Skip to content

ADFA-2589 Fix unzip hygiene #848

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

Merged
hal-eisen-adfa merged 2 commits into from
Jan 17, 2026
Merged

ADFA-2589 Fix unzip hygiene #848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abfe99d
Improve Path Validation; Add Entry Name Sanitization; Align with Exis…
hal-eisen-adfa Jan 17, 2026
0713904
Merge branch 'stage' into ADFA-2589-Reduce-security-risk-during-unzip…
hal-eisen-adfa Jan 17, 2026
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
16 changes: 13 additions & 3 deletions app/src/main/java/com/itsaky/androidide/assets/AssetsInstallationHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,21 @@ object AssetsInstallationHelper {
destDir: Path,
) {
Files.createDirectories(destDir)
// Normalize and make destDir absolute for secure path validation
val normalizedDestDir = destDir.toAbsolutePath().normalize()

ZipInputStream(srcStream.buffered()).useEntriesEach { zipInput, entry ->
val destFile = destDir.resolve(entry.name).normalize()
if (!destFile.pathString.startsWith(destDir.pathString)) {
// Validate entry name doesn't contain dangerous patterns
if (entry.name.contains("..") || entry.name.startsWith("/") || entry.name.startsWith("\\")) {
throw IllegalStateException("Zip entry contains dangerous path components: ${entry.name}")
}

val destFile = normalizedDestDir.resolve(entry.name).normalize()

// Use Path.startsWith() for proper path validation instead of string comparison
if (!destFile.startsWith(normalizedDestDir)) {
// DO NOT allow extraction to outside of the target dir
throw IllegalStateException("Entry is outside of the target dir: ${zipInput.buffered()}")
throw IllegalStateException("Entry is outside of the target dir: ${entry.name}")
}

if (entry.isDirectory) {
Expand Down