support dopamine jb

Author: hackcatml

Sources/include/opainject/spawnpacchild.m

@@ -12,7 +12,7 @@ void spawnPacChild(int argc, char *argv[])
     argsToPass[argc] = "pac";
     argsToPass[argc+1] = NULL;
 
-    pid_t targetPid = atoi(argv[1]);
+    pid_t targetPid = atoi(argv[argc - 1]);
     mach_port_t task;
     kern_return_t kr = KERN_SUCCESS;
     kr = task_for_pid(mach_task_self(), targetPid, &task);

Sources/mldecrypt/Tool.swift

@@ -185,6 +185,21 @@ func setDecryptTarget(set: Bool, bundleId: String) -> Void {
 }
 
 func backup(arguments: [String], bundleId: String) -> Void {
+    if isRootless() {
+        let decryptedFile = AppUtils.sharedInstance().searchAppExecutable(bundleId) + ".decrypted"
+        let appDocumentsPath = AppUtils.sharedInstance().searchAppDataDir(bundleId) + "/Documents/"
+        let decryptedFilePath = appDocumentsPath + decryptedFile
+        let srcURL = URL(fileURLWithPath: decryptedFilePath)
+        let dstURL = URL(fileURLWithPath: documentsPath + decryptedFile)
+        do {
+            try FileManager.default.copyItem(at: srcURL, to: dstURL)
+            try FileManager.default.removeItem(at: srcURL)
+        }
+        catch {
+            print("Error: \(error.localizedDescription)")
+        }
+    }
+    
     let documentsURL = URL(string: documentsPath)!
     let filelist = try! FileManager.default.contentsOfDirectory(atPath: documentsURL.path)
     let bundleExecutable = AppUtils.sharedInstance().searchAppExecutable(bundleId)!
@@ -221,36 +236,46 @@ func opainject(arguments: [String]) -> Void {
         exit(1)
     }
 
-    let bundleId = arguments[index]
-    
-    let processList = Getpid()
-    guard let processes = processList.processes else {
-        print("Failed to retrieve process list.")
-        exit(1)
-    }
     var targetPid: Int32 = 0
-    for process in processes {
-        let pid = process.kp_proc.p_pid
-        let name = withUnsafePointer(to: process.kp_proc.p_comm) {
-            String(cString: UnsafeRawPointer($0).assumingMemoryBound(to: CChar.self))
+    let bundleId = arguments[index]
+    if isArm64eDevice(), CommandLine.argc >= 5 {
+        let index = arguments.firstIndex(where: {
+            $0.allSatisfy({ $0.isNumber })
+        })
+        targetPid = Int32(arguments[index!])!
+    } else {
+        let processList = Getpid()
+        guard let processes = processList.processes else {
+            print("Failed to retrieve process list.")
+            exit(1)
         }
-        if name.contains(AppUtils.sharedInstance().searchAppExecutable(bundleId)!) {
-            targetPid = Int32(pid)
-            break
+        for process in processes {
+            let pid = process.kp_proc.p_pid
+            let name = withUnsafePointer(to: process.kp_proc.p_comm) {
+                String(cString: UnsafeRawPointer($0).assumingMemoryBound(to: CChar.self))
+            }
+            if name.contains(AppUtils.sharedInstance().searchAppExecutable(bundleId)!) {
+                targetPid = Int32(pid)
+                break
+            }
+        }
+        guard targetPid != 0 else {
+            print("Cannot find pid for \(bundleId)")
+            exit(1)
         }
-    }
-    guard targetPid != 0 else {
-        print("Cannot find pid for \(bundleId)")
-        exit(1)
     }
 
     if isArm64eDevice() {
         var pacArg: UnsafeMutablePointer<Int8>? = nil
-        if CommandLine.argc >= 4 {
-            pacArg = CommandLine.unsafeArgv[3]
+        if CommandLine.argc >= 5 {
+            pacArg = CommandLine.unsafeArgv[Int(CommandLine.argc) - 1]
         }
         if pacArg == nil || String(cString: pacArg!) != "pac" {
-            spawnPacChild(CommandLine.argc, CommandLine.unsafeArgv)
+            let pidString = String(targetPid)
+            let pidPtr = strdup(pidString)
+
+            CommandLine.unsafeArgv[Int(CommandLine.argc)] = pidPtr
+            spawnPacChild(CommandLine.argc + 1, CommandLine.unsafeArgv)
             exit(0)
         }
     }
@@ -295,6 +320,9 @@ func opainject(arguments: [String]) -> Void {
     if arguments.contains("-b") {
         sleep(4)
         backup(arguments: arguments, bundleId: bundleId)
+    } else {
+        sleep(1)
+        backup(arguments: arguments, bundleId: bundleId)
     }
 
     exit(0)
@@ -346,6 +374,17 @@ public struct mldecrypt {
             print(helpString)
             exit(0)
         } else if arguments.contains("-r") {
+            var index = arguments.firstIndex(of: "-r")
+            if index != 1 {
+                print("\nUsage: mldecrypt -r <bundleId> || mldecrypt -r -b <bundleId>")
+                exit(1)
+            } else if arguments.contains("-b") {
+                index = arguments.firstIndex(of: "-b")
+                if index != 2 {
+                    print("\nUsage: mldecrypt -r <bundleId> || mldecrypt -r -b <bundleId>")
+                    exit(1)
+                }
+            }
             opainject(arguments: arguments)
         } else if arguments.count == 2 || (arguments.count == 3 && arguments[1].contains("-b")) {
             let bundleId = arguments.count == 2 ? arguments[1] : arguments[2]

Sources/mldecryptor/Tweak.swift

@@ -20,10 +20,8 @@ func isRootless() -> Bool {
 func dumpstart(_ targetImgName: UnsafeMutablePointer<Int8>?) {
     os_log("[hackcatml] binary dump started")
 
-    var documentsPath = "/var/mobile/Documents/"
-    if isRootless() {
-        documentsPath = "/var/jb" + documentsPath
-    }
+    let appDocumentsPath = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.path + "/"
+    var documentsPath = isRootless() ? appDocumentsPath : "/var/mobile/Documents/"
     let dumpPath: String = documentsPath + URL(fileURLWithPath: Bundle.main.executablePath ?? "").lastPathComponent + ".decrypted"
     if FileManager.default.fileExists(atPath: dumpPath) {
         unlink(dumpPath)

control

@@ -1,6 +1,6 @@
 Package: com.hackcatml.mldecrypt
 Name: mldecrypt
-Version: 0.1.1
+Version: 0.1.2
 Architecture: iphoneos-arm
 Description: An awesome tool of some sort!!
 Maintainer: hackcatml

module/cdaswift/cda.h

@@ -39,5 +39,6 @@
 - (NSString*)searchAppExecutable:(NSString*)bundleId;
 - (NSString*)searchAppResourceDir:(NSString*)bundleId;
 - (NSString*)searchAppBundleDir:(NSString*)bundleId;
+- (NSString*)searchAppDataDir:(NSString*)bundleId;
 
 @end

module/cdaswift/cda.mm

@@ -40,20 +40,17 @@ - (void) searchApp:(NSString *)searchTerm
 
 - (NSString*)searchAppExecutable:(NSString*)bundleId
 {
-    int i = 1;
     for(LSApplicationProxy* app in apps){
         NSString *identifier = app.bundleIdentifier;
         if([identifier isEqualToString:bundleId]){
             return app.bundleExecutable;
         }
-        i++;
     }
     return @"Nope";
 }
 
 - (NSString*)searchAppResourceDir:(NSString*)bundleId
 {
-    int i = 1;
     for(LSApplicationProxy* app in apps){
         NSString *identifier = app.bundleIdentifier;
         if([identifier isEqualToString:bundleId]){
@@ -62,21 +59,30 @@ - (NSString*)searchAppResourceDir:(NSString*)bundleId
             // printf("appResourceDir: %s", [appResourceDir UTF8String]);
             return appResourceDir;
         }
-        i++;
     }
     return @"Nope";
 }
 
 - (NSString*)searchAppBundleDir:(NSString*)bundleId
 {
-    int i = 1;
     for(LSApplicationProxy* app in apps){
         NSString* identifier = app.bundleIdentifier;
         if([identifier isEqualToString:bundleId]){
             NSString* appBundleDir = app.bundleContainerURL.path;
             return appBundleDir;
         }
-        i++;
+    }
+    return @"Nope";
+}
+
+- (NSString*)searchAppDataDir:(NSString*)bundleId
+{
+    for(LSApplicationProxy* app in apps){
+        NSString* identifier = app.bundleIdentifier;
+        if([identifier isEqualToString:bundleId]){
+            NSString* appDataDir = app.dataContainerURL.path;
+            return appDataDir;
+        }
     }
     return @"Nope";
 }