Merge pull request #1 from Lessica/main

fix: reap lldb proc

Author: 34306

.gitignore

@@ -7,4 +7,5 @@ obj/
 Payload/
 *.tipa
 *.ipa
-
+.cache/
+compile_commands.json

Makefile

@@ -1,5 +1,5 @@
 TARGET := iphone:clang:latest:15.0
-INSTALL_TARGET_PROCESSES = SpringBoard appstored installd
+INSTALL_TARGET_PROCESSES = SpringBoard appstored installd TrollDecrypt
 ARCHS = arm64 arm64e
 THEOS_PACKAGE_SCHEME = rootless
 THEOS_DEVICE_IP = 192.168.1.32

TDUtils.h

@@ -41,7 +41,6 @@ void decryptApp(NSDictionary *app);
 void decryptAppWithPID(pid_t pid);
 void bfinject_rocknroll(pid_t pid, NSString *appName, NSString *version, pid_t lldb_pid);
 pid_t attachLLDBToProcessByName(const char *executableName, pid_t target_pid);
-void continueLLDBProcess(pid_t lldb_pid);
 void detachLLDB(pid_t lldb_pid);
 NSArray *decryptedFileList(void);
 NSString *docPath(void);

TDUtils.m

@@ -2,6 +2,36 @@
 #import "TDDumpDecrypted.h"
 #import "LSApplicationProxy+AltList.h"
 
+static NSString *getLogPath(void) {
+    return [NSTemporaryDirectory() stringByAppendingPathComponent:@"lldb_output.log"];
+}
+
+static BOOL waitForContentOfFileSync(NSString *filePath, NSString *content, NSTimeInterval timeout) {
+    int fd = open([filePath UTF8String], O_EVTONLY);
+    if (fd == -1) {
+        NSLog(@"[trolldecrypt] Failed to open file for monitoring: %@", filePath);
+        return NO;
+    }
+
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+    dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fd, DISPATCH_VNODE_WRITE, queue);
+    dispatch_source_set_event_handler(source, ^{
+        NSString *fileContent = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
+        if ([fileContent containsString:content]) {
+            NSLog(@"[trolldecrypt] File content matched: %@", filePath);
+            dispatch_semaphore_signal(semaphore);
+        }
+    });
+    dispatch_resume(source);
+
+    int rc = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC)));
+    dispatch_source_cancel(source);
+    close(fd);
+
+    return (rc == 0);
+}
+
 UIWindow *alertWindow = NULL;
 UIWindow *kw = NULL;
 UIViewController *root = NULL;
@@ -120,13 +150,27 @@ void decryptApp(NSDictionary *app) {
             return;
         }
 
+        // Kill existing process if any
+        NSArray *processes;
+        NSLog(@"[trolldecrypt] kill existing process if any...");
+        processes = sysctl_ps();
+        for (NSDictionary *process in processes) {
+            NSString *proc_name = process[@"proc_name"];
+            if ([proc_name isEqualToString:binaryName]) {
+                pid_t pid = [process[@"pid"] intValue];
+                NSLog(@"[trolldecrypt] Found app PID: %d (existing)", pid);
+                kill(pid, SIGKILL);
+                break;
+            }
+        }
+        
         NSLog(@"[trolldecrypt] launch app and lldb force pause...");
-        [[UIApplication sharedApplication] launchApplicationWithIdentifier:bundleID suspended:NO];
-        sleep(2); // Wait for lldb to catch the app
+        [[UIApplication sharedApplication] launchApplicationWithIdentifier:bundleID suspended:YES]; // Launch app in suspended state
+        waitForContentOfFileSync(getLogPath(), @"Architecture set to", 30.0); // Wait for lldb to attach
 
         // Get PID after lldb caught it
         pid_t pid = -1;
-        NSArray *processes = sysctl_ps();
+        processes = sysctl_ps();
         for (NSDictionary *process in processes) {
             NSString *proc_name = process[@"proc_name"];
             if ([proc_name isEqualToString:binaryName]) {
@@ -167,13 +211,12 @@ pid_t attachLLDBToProcessByName(const char *executableName, pid_t target_pid) {
 
     NSString *scriptPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"lldb_attach.txt"];
     NSString *scriptContent = [NSString stringWithFormat:
-        @"process attach --name %s --waitfor\n", executableName];
+        @"process attach --name '%s' --waitfor\n", executableName]; // TODO: shell-escape executableName
     [scriptContent writeToFile:scriptPath atomically:YES encoding:NSUTF8StringEncoding error:nil];
-    
-    NSString *logPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"lldb_output.log"];
+    NSString *logPath = getLogPath();
 
     pid_t lldb_pid = 0;
-    const char *lldb_path = "/var/jb/usr/bin/lldb"; //please edit to use auto scheme for rootful/roothide, i'm lazy and forgot to do it
+    const char *lldb_path = "/var/jb/usr/bin/lldb"; // TODO: please edit to use auto scheme for rootful/roothide, i'm lazy and forgot to do it
     const char *args[] = {
         "lldb",
         "-s", [scriptPath UTF8String],  // Source script file
@@ -193,7 +236,8 @@ pid_t attachLLDBToProcessByName(const char *executableName, pid_t target_pid) {
         NSLog(@"[trolldecrypt] lldb spawned done, lldb PID: %d", lldb_pid);
         NSLog(@"[trolldecrypt] lldb output: %@", logPath);
 
-        sleep(2);
+        waitForContentOfFileSync(logPath, @"process attach --name", 5.0);
+        sleep(1); // Give lldb a moment to settle
 
         // Verify lldb is still running
         if (kill(lldb_pid, 0) == 0) {
@@ -210,13 +254,6 @@ pid_t attachLLDBToProcessByName(const char *executableName, pid_t target_pid) {
     return lldb_pid;
 }
 
-//i was trying to make sure the app is paused before killed, but not success... can anyone help!?
-void continueLLDBProcess(pid_t lldb_pid) {
-    if (lldb_pid <= 0) return;
-    
-    NSLog(@"[trolldecrypt] 'continue' to lldb (PID: %d)", lldb_pid);
-}
-
 // Detach lldb from process
 void detachLLDB(pid_t lldb_pid) {
     if (lldb_pid > 0) {
@@ -232,6 +269,10 @@ void detachLLDB(pid_t lldb_pid) {
         }
 
         NSLog(@"[trolldecrypt] lldb detached successfully");
+
+        // Reap the lldb process
+        int unused;
+        waitpid(lldb_pid, &unused, WNOHANG);
     }
 }
 
@@ -282,9 +323,6 @@ void bfinject_rocknroll(pid_t pid, NSString *appName, NSString *version, pid_t l
         [dd createIPAFile:pid];
         NSLog(@"[trolldecrypt] Decryption complete!");
 
-        continueLLDBProcess(lldb_pid);
-        sleep(1); 
-
         NSLog(@"[trolldecrypt] Detaching lldb...");
         detachLLDB(lldb_pid);