iDevice Toolkit v2.0: Device, Mirror, Media Browser e melhorias gerais

.gitignore

@@ -79,3 +79,7 @@ $RECYCLE.BIN/
 
 /local/
 *.afphoto
+
+### Python
+__pycache__/
+*.pyc

compile.bat

@@ -0,0 +1,6 @@
+@echo off
+cd /d "%~dp0"
+echo Compiling iTunes Backup Explorer...
+call mvn -q -DskipTests compile assembly:single
+echo.
+echo Done! Run with: run.bat

compile.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "$0")"
+echo "Compiling iTunes Backup Explorer..."
+mvn -q -DskipTests compile assembly:single
+echo ""
+echo "Done! Run with: ./run.sh"

packaging/package-linux.sh

@@ -68,4 +68,5 @@ echo Packaging...
     --app-image "target/app-image/$APP_NAME" \
     --linux-menu-group "Utility;Archiving;" \
     --linux-shortcut \
-    --linux-app-category "utils"
+    --linux-app-category "utils" \
+    --linux-package-deps "ffmpeg, imagemagick, libheif1, libimobiledevice-utils, usbmuxd, ideviceinstaller, python3, python3-venv, python3-pip"

packaging/package-win.bat

@@ -63,6 +63,21 @@ CALL "%JAVA_HOME%\bin\jpackage" ^
     --runtime-image "target\runtime-image" ^
     --module "%MAIN_MODULE%/%MAIN_CLASS%"
 
+REM Include portable media tools if available on the build machine
+SET MEDIA_TOOLS_SRC=%USERPROFILE%\.config\itunes-backup-explorer
+SET MEDIA_TOOLS_DEST=target\app-image\%APP_NAME%\app\media-tools
+
+IF EXIST "%MEDIA_TOOLS_SRC%\ffmpeg-portable" (
+    echo Including bundled ffmpeg...
+    XCOPY /E /I /Q "%MEDIA_TOOLS_SRC%\ffmpeg-portable" "%MEDIA_TOOLS_DEST%\ffmpeg-portable"
+)
+
+IF EXIST "%MEDIA_TOOLS_SRC%\imagemagick-portable" (
+    echo Including bundled ImageMagick...
+    XCOPY /E /I /Q "%MEDIA_TOOLS_SRC%\imagemagick-portable" "%MEDIA_TOOLS_DEST%\imagemagick-portable"
+)
+
+
 CALL "%JAVA_HOME%\bin\jpackage" ^
     --type msi ^
     --dest "target\installer" ^

pom.xml

@@ -57,6 +57,22 @@
             <artifactId>slf4j-simple</artifactId>
             <version>2.0.16</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.27.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.tukaani</groupId>
+            <artifactId>xz</artifactId>
+            <version>1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.11.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>
@@ -206,6 +222,18 @@
                         <goals>
                             <goal>exec</goal>
                         </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${project.basedir}/scripts/run-dev.sh</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>run-java</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
                         <configuration>
                             <executable>java</executable>
                             <arguments>
@@ -240,6 +268,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.2</version>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.7.1</version>

run.bat

@@ -0,0 +1,35 @@
+@echo off
+setlocal
+cd /d "%~dp0"
+
+set JAR=
+if exist target (
+    for %%f in (target\*-jar-with-dependencies.jar) do set JAR=%%f
+)
+
+if not defined JAR (
+    echo.
+    echo  Compiling iTunes Backup Explorer...
+    echo.
+    call mvn -q -DskipTests compile assembly:single
+    if errorlevel 1 (
+        echo.
+        echo  ERROR: Compilation failed.
+        echo  Make sure Java 18+ [JDK] and Maven are installed and in your PATH.
+        echo.
+        pause
+        exit /b 1
+    )
+    for %%f in (target\*-jar-with-dependencies.jar) do set JAR=%%f
+)
+
+if not defined JAR (
+    echo.
+    echo  ERROR: Could not find the compiled JAR.
+    echo.
+    pause
+    exit /b 1
+)
+
+echo Starting iTunes Backup Explorer...
+java -jar "%JAR%"

run.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "$0")"
+
+JAR=$(find target -maxdepth 1 -name '*-jar-with-dependencies.jar' 2>/dev/null | head -1)
+
+if [ -z "$JAR" ]; then
+    echo ""
+    echo " Compiling iTunes Backup Explorer..."
+    echo ""
+    mvn -q -DskipTests compile assembly:single
+    JAR=$(find target -maxdepth 1 -name '*-jar-with-dependencies.jar' | head -1)
+fi
+
+if [ -z "$JAR" ]; then
+    echo ""
+    echo " ERROR: Compilation failed."
+    echo " Make sure Java 18+ (JDK) and Maven are installed."
+    exit 1
+fi
+
+echo "Starting iTunes Backup Explorer..."
+java -jar "$JAR"

scripts/run-dev.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Always compile first so mvn exec:exec runs the latest code.
+mvn -q -DskipTests compile exec:exec@run-java

src/main/java/me/maxih/itunes_backup_explorer/ITunesBackupExplorer.java

@@ -6,6 +6,7 @@
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
+import me.maxih.itunes_backup_explorer.ui.PreferencesController;
 import me.maxih.itunes_backup_explorer.ui.WindowController;
 
 import java.io.IOException;
@@ -19,9 +20,10 @@ public class ITunesBackupExplorer extends Application {
     public void start(Stage stage) throws IOException {
         FXMLLoader fxmlLoader = new FXMLLoader(ITunesBackupExplorer.class.getResource("window.fxml"));
         Parent root = fxmlLoader.load();
+        root.getStyleClass().add("Light".equalsIgnoreCase(PreferencesController.getTheme()) ? "theme-light" : "theme-dark");
         controller = fxmlLoader.getController();
 
-        scene = new Scene(root, 800, 500);
+        scene = new Scene(root, 1400, 800);
         stage.setScene(scene);
         stage.setTitle("iTunes Backup Explorer");
         stage.setMinWidth(500);

src/main/java/me/maxih/itunes_backup_explorer/api/BackupFile.java

@@ -3,6 +3,8 @@
 import com.dd.plist.*;
 import me.maxih.itunes_backup_explorer.util.BackupPathUtils;
 import me.maxih.itunes_backup_explorer.util.UtilDict;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.nio.ByteBuffer;
@@ -15,6 +17,7 @@
 import java.util.Optional;
 
 public class BackupFile {
+    private static final Logger logger = LoggerFactory.getLogger(BackupFile.class);
     public final ITunesBackup backup;
     public final UtilDict data;
     public final String fileID;
@@ -85,19 +88,28 @@ public BackupFile(ITunesBackup backup, String fileID, String domain, String rela
     }
 
     private <T extends NSObject> T getObject(Class<T> type, UID uid) throws NoSuchElementException {
-        byte index = uid.getBytes()[0];
+        int index = uidToIndex(uid);
+        if (index < 0 || index >= this.objects.length) throw new NoSuchElementException();
         Object obj = this.objects[index];
         if (type.isInstance(obj)) return type.cast(obj);
         throw new NoSuchElementException();
     }
 
     private void setObject(UID uid, NSObject object) {
-        byte index = uid.getBytes()[0];
+        int index = uidToIndex(uid);
         this.objects[index] = object;
-        // theoretically not necessary, but don't rely on the array never being cloned
         this.data.put("$objects", new NSArray(this.objects));
     }
 
+    static int uidToIndex(UID uid) {
+        byte[] bytes = uid.getBytes();
+        int index = 0;
+        for (byte b : bytes) {
+            index = (index << 8) | (b & 0xFF);
+        }
+        return index;
+    }
+
     public FileType getFileType() {
         return fileType;
     }
@@ -162,6 +174,11 @@ byte[] calcFileDigest() throws IOException, UnsupportedCryptoException {
 
     public void extract(File destination)
             throws IOException, BackupReadException, NotUnlockedException, UnsupportedCryptoException, UnsupportedOperationException {
+        extract(destination, true);
+    }
+
+    public void extract(File destination, boolean preserveTimestamps)
+            throws IOException, BackupReadException, NotUnlockedException, UnsupportedCryptoException, UnsupportedOperationException {
 
         switch (this.fileType) {
             case DIRECTORY:
@@ -178,14 +195,23 @@ public void extract(File destination)
                         throw new BackupReadException(e);
                     }
 
-                    //noinspection ResultOfMethodCallIgnored
-                    this.properties.get(NSNumber.class, "LastModified")
-                            .map(NSNumber::longValue)
-                            .map(seconds -> seconds * 1000)
-                            .ifPresent(destination::setLastModified);
+                    if (preserveTimestamps) {
+                        //noinspection ResultOfMethodCallIgnored
+                        this.properties.get(NSNumber.class, "LastModified")
+                                .map(NSNumber::longValue)
+                                .map(seconds -> seconds * 1000)
+                                .ifPresent(destination::setLastModified);
+                    }
                 } else {
                     Files.copy(this.contentFile.toPath(), destination.toPath(),
                             StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+
+                    if (preserveTimestamps) {
+                        this.properties.get(NSNumber.class, "LastModified")
+                                .map(NSNumber::longValue)
+                                .map(seconds -> seconds * 1000)
+                                .ifPresent(destination::setLastModified);
+                    }
                 }
                 break;
             case SYMBOLIC_LINK:
@@ -196,6 +222,11 @@ public void extract(File destination)
 
     public void extractToFolder(File destinationFolder, boolean withRelativePath)
             throws IOException, BackupReadException, NotUnlockedException, UnsupportedCryptoException, UnsupportedOperationException {
+        extractToFolder(destinationFolder, withRelativePath, true);
+    }
+
+    public void extractToFolder(File destinationFolder, boolean withRelativePath, boolean preserveTimestamps)
+            throws IOException, BackupReadException, NotUnlockedException, UnsupportedCryptoException, UnsupportedOperationException {
 
         String relative;
 
@@ -206,17 +237,21 @@ public void extractToFolder(File destinationFolder, boolean withRelativePath)
                 relative = withRelativePath
                         ? Paths.get(this.domain, BackupPathUtils.cleanPath(this.relativePath)).toString()
                         : BackupPathUtils.cleanPath(this.getFileName());
-                System.out.println("Continuing with invalid characters replaced: " + this.getFileName() + " -> " + relative);
+                logger.warn("Continuing with invalid characters replaced: {} -> {}", this.getFileName(), relative);
             } catch (InvalidPathException e1) {
                 throw new IOException("Invalid character in filename, failed to replace", e1);
             }
         }
         File destination = new File(destinationFolder.getAbsolutePath(), relative);
+        if (!destination.getCanonicalPath().startsWith(destinationFolder.getCanonicalPath() + File.separator)
+                && !destination.getCanonicalPath().equals(destinationFolder.getCanonicalPath())) {
+            throw new IOException("Path traversal detected: " + relative);
+        }
         if (destination.exists() && this.fileType != FileType.DIRECTORY)
             throw new FileAlreadyExistsException(destination.getAbsolutePath());
 
         Files.createDirectories(destination.getParentFile().toPath());
-        this.extract(destination);
+        this.extract(destination, preserveTimestamps);
     }
 
     public void replaceWith(File newFile) throws IOException, BackupReadException, UnsupportedCryptoException, NotUnlockedException, DatabaseConnectionException {
@@ -261,7 +296,7 @@ public void delete() throws IOException, DatabaseConnectionException {
         try {
             this.backupOriginal(true);
         } catch (FileNotFoundException e) {
-            System.out.printf("Warning: Deleted backup file '%s' did not have a content file%n", this.relativePath);
+            logger.warn("Deleted backup file '{}' had no content file", this.relativePath);
         }
         this.backup.removeFileFromDatabase(this.fileID);
     }

src/main/java/me/maxih/itunes_backup_explorer/api/BackupInfo.java

@@ -41,7 +41,7 @@ public BackupInfo(NSDictionary data) throws BackupReadException {
             dict.getDict("Applications").orElseThrow().forTypedEntries(NSDictionary.class, (key, value) -> {
                 UtilDict info = new UtilDict(value);
                 ApplicationInfo app = new ApplicationInfo(
-                        info.getData("PlaceholderIcon").orElseThrow(),
+                        info.getData("PlaceholderIcon").orElse(null),
                         info.getData("iTunesMetadata").orElse(null),
                         info.getBoolean("IsDemotedApp").orElse(false),
                         info.getData("ApplicationSINF").orElse(null)

src/main/java/me/maxih/itunes_backup_explorer/api/BackupManifest.java

@@ -40,9 +40,9 @@ public BackupManifest(NSDictionary data) throws BackupReadException {
             this.passcodeSet = dict.getBoolean("WasPasscodeSet").orElseThrow();
             this.productVersion = lockdown.getString("ProductVersion").orElseThrow();
             this.productType = lockdown.getString("ProductType").orElseThrow();
-            this.buildVersion = lockdown.getString("BuildVersion").orElseThrow();
-            this.uniqueDeviceID = lockdown.getString("UniqueDeviceID").orElseThrow();
-            this.serialNumber = lockdown.getString("SerialNumber").orElseThrow();
+            this.buildVersion = lockdown.getString("BuildVersion").orElse("");
+            this.uniqueDeviceID = lockdown.getString("UniqueDeviceID").orElse("");
+            this.serialNumber = lockdown.getString("SerialNumber").orElse("");
             this.deviceName = lockdown.getString("DeviceName").orElseThrow();
             this.applications = dict.get(NSDictionary.class, "Applications").orElseThrow();
             if (this.encrypted) {