react-native-zip-archive 6.0.9-dev.1 → 6.1.0

package/android/src/main/java/com/rnziparchive/RNZipArchiveModule.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+//import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 import net.lingala.zip4j.exception.ZipException;
@@ -141,70 +141,15 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
           final long[] extractedBytes = {0};
           final int[] lastPercentage = {0};
 
-          ZipFile zipFile = null;
+          net.lingala.zip4j.ZipFile zipFile = null;
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+            zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
+            zipFile.setCharset(Charset.forName(charset));
           } else {
-            zipFile = new ZipFile(zipFilePath);
+            zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
           }
 
-          final Enumeration<? extends ZipEntry> entries = zipFile.entries();
-          Log.d(TAG, "Zip has " + zipFile.size() + " entries");
-          while (entries.hasMoreElements()) {
-            final ZipEntry entry = entries.nextElement();
-            if (entry.isDirectory()) continue;
-
-            StreamUtil.ProgressCallback cb = new StreamUtil.ProgressCallback() {
-              @Override
-              public void onCopyProgress(long bytesRead) {
-                extractedBytes[0] += bytesRead;
-
-                int lastTime = lastPercentage[0];
-                int percentDone = (int) ((double) extractedBytes[0] * 100 / (double) totalUncompressedBytes);
-
-                // update at most once per percent.
-                if (percentDone > lastTime) {
-                  lastPercentage[0] = percentDone;
-                  updateProgress(extractedBytes[0], totalUncompressedBytes, zipFilePath);
-                }
-              }
-            };
-
-            File fout = new File(destDirectory, entry.getName());
-            String canonicalPath = fout.getCanonicalPath();
-            String destDirCanonicalPath = (new File(destDirectory).getCanonicalPath()) + File.separator;
-
-            if (!canonicalPath.startsWith(destDirCanonicalPath)) {
-                 throw new SecurityException(String.format("Found Zip Path Traversal Vulnerability with %s", canonicalPath));
-            }
-            
-            if (!fout.exists()) {
-              //noinspection ResultOfMethodCallIgnored
-              (new File(fout.getParent())).mkdirs();
-            }
-            InputStream in = null;
-            BufferedOutputStream Bout = null;
-            try {
-              in = zipFile.getInputStream(entry);
-              Bout = new BufferedOutputStream(new FileOutputStream(fout));
-              StreamUtil.copy(in, Bout, cb);
-              Bout.close();
-              in.close();
-            } catch (IOException ex) {
-              if (in != null) {
-                try {
-                  in.close();
-                } catch (Exception ignored) {
-                }
-              }
-              if (Bout != null) {
-                try {
-                  Bout.close();
-                } catch (Exception ignored) {
-                }
-              }
-            }
-          }
+          zipFile.extractAll(destDirectory);
 
           zipFile.close();
           updateProgress(1, 1, zipFilePath); // force 100%
@@ -471,6 +416,12 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
             .emit(PROGRESS_EVENT_NAME, map);
   }
 
+  @ReactMethod
+  public void getUncompressedSize(String zipFilePath, String charset, final Promise promise) {
+    long totalSize = getUncompressedSize(zipFilePath, charset);
+    promise.resolve((double) totalSize);
+  }
+  
   /**
    * Return the uncompressed size of the ZipFile (only works for files on disk, not in assets)
    *
@@ -479,20 +430,22 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
   private long getUncompressedSize(String zipFilePath, String charset) {
     long totalSize = 0;
     try {
-      ZipFile zipFile = null;
+      net.lingala.zip4j.ZipFile zipFile = null;
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+        zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
+        zipFile.setCharset(Charset.forName(charset));
       } else {
-        zipFile = new ZipFile(zipFilePath);
+        zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
       }
-      Enumeration<? extends ZipEntry> entries = zipFile.entries();
-      while (entries.hasMoreElements()) {
-        ZipEntry entry = entries.nextElement();
-        long size = entry.getSize();
+
+      final List <FileHeader> files = zipFile.getFileHeaders();
+      for(FileHeader it : files) {
+        long size = it.getUncompressedSize();
         if (size != -1) {
           totalSize += size;
         }
       }
+
       zipFile.close();
     } catch (IOException ignored) {
       return -1;

package/index.d.ts

@@ -12,4 +12,5 @@ declare module 'react-native-zip-archive' {
   export function unzipWithPassword(assetPath: string, target: string, password: string): Promise<string>;
   export function unzipAssets(assetPath: string, target: string): Promise<string>;
   export function subscribe(callback: ({ progress, filePath }: { progress: number, filePath: string }) => void): NativeEventSubscription;
+  export function getUncompressedSize(source: string, charset?: string): Promise<number>;
 }

package/index.js

@@ -64,3 +64,7 @@ export const unzipAssets = (source, target) => {
 export const subscribe = (callback) => {
   return rnzaEmitter.addListener("zipArchiveProgressEvent", callback);
 };
+
+export const getUncompressedSize = (source, charset = "UTF-8") => {
+  return RNZipArchive.getUncompressedSize(normalizeFilePath(source), charset);
+};

package/ios/RNZipArchive.m

@@ -194,6 +194,22 @@ RCT_EXPORT_METHOD(zipFilesWithPassword:(NSArray<NSString *> *)from
     }
 }
 
+
+RCT_EXPORT_METHOD(getUncompressedSize:(NSString *)path
+                  charset:(NSString *)charset
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    NSError *error = nil;
+    NSNumber *wantedFileSize = [SSZipArchive payloadSizeForArchiveAtPath:path error:&error];
+
+    if (error == nil) {
+        resolve(wantedFileSize);
+    } else {
+//        reject(@"get_uncompressed_size_error", [error localizedDescription], error);
+        resolve(@-1);
+    }
+}
+
 - (dispatch_queue_t)methodQueue {
     return dispatch_queue_create("com.mockingbot.ReactNative.ZipArchiveQueue", DISPATCH_QUEUE_SERIAL);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zip-archive",
-  "version": "6.0.9-dev.1",
+  "version": "6.1.0",
   "description": "A little wrapper on ZipArchive for react-native",
   "main": "index.js",
   "scripts": {