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 MitM vulnerability #2132

Merged
merged 2 commits into from
Aug 25, 2021
Merged

Fix MitM vulnerability #2132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc3bc1e
Fix MitM vulnerability
andreidubov Aug 23, 2021
4b6152b
Revert package-lock.json
andreidubov Aug 24, 2021
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
15 changes: 7 additions & 8 deletions android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,13 @@ public static String readFileToString(String filePath) throws IOException {
}
}

private static String validateFileName(String fileName, String targetDirectory) throws IOException {
File file = new File(fileName);
String canonicalPath = file.getCanonicalPath();
private static String validateFileName(String fileName, File destinationFolder) throws IOException {
String destinationFolderCanonicalPath = destinationFolder.getCanonicalPath();

File targetFile = new File(targetDirectory);
String targetCanonicalPath = targetFile.getCanonicalPath();
File file = new File(destinationFolderCanonicalPath, fileName);
String canonicalPath = file.getCanonicalPath();

if (!canonicalPath.startsWith(targetCanonicalPath)) {
if (!canonicalPath.startsWith(destinationFolderCanonicalPath)) {
throw new IllegalStateException("File is outside extraction target directory.");
}

Expand All @@ -151,12 +150,12 @@ public static void unzipFile(File zipFile, String destination) throws IOExceptio
if (destinationFolder.exists()) {
deleteFileOrFolderSilently(destinationFolder);
}

destinationFolder.mkdirs();

byte[] buffer = new byte[WRITE_BUFFER_SIZE];
while ((entry = zipStream.getNextEntry()) != null) {
String fileName = validateFileName(entry.getName(), ".");
String fileName = validateFileName(entry.getName(), destinationFolder);
File file = new File(destinationFolder, fileName);
if (entry.isDirectory()) {
file.mkdirs();
Expand Down