Use Commons Compress instead of libfragmentzip for BuildManifest.plist

Author: airsquared

.github/workflows/main.yml

@@ -16,9 +16,6 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '15'
-      - name: Install Linux dependencies
-        run: sudo apt install libcurl4-openssl-dev libzip-dev && git clone --depth=1 https://github.com/tihmstar/libgeneral.git && cd libgeneral && ./autogen.sh && make && sudo make install && git clone --depth=1 https://github.com/tihmstar/libfragmentzip.git && cd libfragmentzip && sed -i '/LIBGENERAL_REQUIRES_STR/d' ./configure.ac && ./autogen.sh && make && sudo make install && sudo ln -s /usr/local/lib/libfragmentzip.so /usr/lib/
-        if: runner.os == 'Linux'
       - name: gradle build
         uses: eskatos/gradle-command-action@v1
         with:

build.gradle

@@ -59,6 +59,8 @@ dependencies {
     implementation group: 'org.json', name: 'json', version: '20210307'
     implementation 'de.jangassen:nsmenufx:3.1.0'
 //    implementation 'net.java.dev.jna:jna:jpms:5.7.0'
+    implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.20'
+
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
 }

dist/linux/README-linux.txt

@@ -1,12 +1,4 @@
-blobsaver has one required dependency and two optional.
-Make sure to install these on your system before continuing.
+blobsaver has two optional dependencies for reading information from connected devices:
 
-Required:
-  - libfragmentzip (https://github.com/tihmstar/libfragmentzip)
-
-Optional (for reading information from connected devices):
-  - libimobiledevice (https://github.com/libimobiledevice/libimobiledevice)
-  - libirecovery (https://github.com/libimobiledevice/libirecovery)
-
-If you do not install these optional dependencies, blobsaver's
-"Read from device" feature will not work.
+  - libimobiledevice: https://github.com/libimobiledevice/libimobiledevice (for ECID and device information)
+  - libirecovery: https://github.com/libimobiledevice/libirecovery (for reading apnonce)

src/main/java/airsquared/blobsaver/app/TSS.java

@@ -88,7 +88,7 @@ protected String call() throws TSSException {
         // can't use forEach() because exception won't be caught
         for (Utils.IOSVersion iosVersion : iosVersions) {
             try {
-                args.set(args.size() - 1, extractBuildManifest(iosVersion.ipswURL).getAbsolutePath());
+                args.set(args.size() - 1, extractBuildManifest(iosVersion.ipswURL).toString());
             } catch (IOException e) {
                 throw new TSSException("Unable to extract BuildManifest.", true, e);
             }

src/main/java/airsquared/blobsaver/app/Utils.java

@@ -18,7 +18,6 @@
 
 package airsquared.blobsaver.app;
 
-import airsquared.blobsaver.app.natives.Libfragmentzip;
 import com.sun.jna.Platform;
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
@@ -35,19 +34,21 @@
 import javafx.scene.paint.Color;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Window;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UncheckedIOException;
+import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.SeekableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -358,15 +359,100 @@ public String toString() {
         }
     }
 
-    static File extractBuildManifest(String url) throws IOException {
-        File buildManifest = File.createTempFile("BuildManifest", ".plist");
-        System.out.println("Extracting build manifest from " + url);
-        int err = Libfragmentzip.downloadFile(url, "BuildManifest.plist", buildManifest.getAbsolutePath());
-        if (err != 0) {
-            throw new IOException("problem with libfragmentzip download: code=" + err);
+    static Path extractBuildManifest(String ipswUrl) throws IOException {
+        Path buildManifest = Files.createTempFile("BuildManifest", ".plist");
+        try (ZipFile ipsw = new ZipFile(new HttpChannel(new URL(ipswUrl)), "ipsw", "UTF8", true, true);
+             InputStream is = ipsw.getInputStream(ipsw.getEntry("BuildManifest.plist"))) {
+            Files.copy(is, buildManifest, StandardCopyOption.REPLACE_EXISTING);
         }
         System.out.println("Extracted to " + buildManifest);
-        return buildManifest;
+        return buildManifest.toRealPath();
+    }
+
+    /**
+     * Source: https://github.com/jcodec/jcodec/blob/6e1ec651eca92d21b41f9790143a0e6e4d26811e/android/src/main/org/jcodec/common/io/HttpChannel.java
+     *
+     * @author The JCodec project
+     */
+    private static final class HttpChannel implements SeekableByteChannel {
+
+        private final URL url;
+        private ReadableByteChannel ch;
+        private long pos;
+        private long length;
+
+        public HttpChannel(URL url) {
+            this.url = url;
+        }
+
+        @Override
+        public long position() {
+            return pos;
+        }
+
+        @Override
+        public SeekableByteChannel position(long newPosition) throws IOException {
+            if (newPosition == pos) {
+                return this;
+            } else if (ch != null) {
+                ch.close();
+                ch = null;
+            }
+            pos = newPosition;
+            return this;
+        }
+
+        @Override
+        public long size() throws IOException {
+            ensureOpen();
+            return length;
+        }
+
+        @Override
+        public SeekableByteChannel truncate(long size) {
+            throw new UnsupportedOperationException("Truncate on HTTP is not supported.");
+        }
+
+        @Override
+        public int read(ByteBuffer buffer) throws IOException {
+            ensureOpen();
+            int read = ch.read(buffer);
+            if (read != -1)
+                pos += read;
+            return read;
+        }
+
+        @Override
+        public int write(ByteBuffer buffer) {
+            throw new UnsupportedOperationException("Write to HTTP is not supported.");
+        }
+
+        @Override
+        public boolean isOpen() {
+            return ch != null && ch.isOpen();
+        }
+
+        @Override
+        public void close() throws IOException {
+            ch.close();
+        }
+
+        private void ensureOpen() throws IOException {
+            if (ch == null) {
+                URLConnection connection = url.openConnection();
+                if (pos > 0)
+                    connection.addRequestProperty("Range", "bytes=" + pos + "-");
+                ch = Channels.newChannel(connection.getInputStream());
+                String resp = connection.getHeaderField("Content-Range");
+                if (resp != null) {
+                    length = Long.parseLong(resp.split("/")[1]);
+                } else {
+                    resp = connection.getHeaderField("Content-Length");
+                    length = Long.parseLong(resp);
+                }
+            }
+        }
+
     }
 
     static String exceptionToString(Throwable t) {

src/main/java/airsquared/blobsaver/app/natives/Libfragmentzip.java

@@ -7,4 +7,5 @@
     requires com.sun.jna;
     requires nsmenufx;
     requires org.json;
+    requires org.apache.commons.compress;
 }

src/main/java/module-info.java

@@ -20,19 +20,26 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class UtilsTest extends BlobsaverTest {
 
     private static final String ipswUrl = "http://updates-http.cdn-apple.com/2020WinterFCS/fullrestores/061-20302/454ACB32-D3F6-4984-92CB-27C8FA368165/iPhone11,8,iPhone12,1_13.4_17E255_Restore.ipsw";
 
     @Test
     public void extractBuildManifest() throws IOException {
-        File buildManifest = Utils.extractBuildManifest(ipswUrl);
-        assertTrue(buildManifest.exists());
-        assertTrue(buildManifest.isFile());
+        Path buildManifest = Utils.extractBuildManifest(ipswUrl);
+
+        try (var reader = Files.newBufferedReader(buildManifest)) {
+            assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", reader.readLine());
+            assertEquals("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">", reader.readLine());
+            assertEquals("<plist version=\"1.0\">", reader.readLine());
+            assertEquals("<dict>", reader.readLine());
+        }
     }
+
 }