Log improvements, error handling improvements

opa334 · Jun 20, 2024 · 43c03c1 · 43c03c1
1 parent cdded6d
commit 43c03c1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/Application/Dopamine/Jailbreak/DOEnvironmentManager.h b/Application/Dopamine/Jailbreak/DOEnvironmentManager.h
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSString *)versionSupportString;
 - (NSString *)accessibleKernelPath;
 - (void)locateJailbreakRoot;
-- (void)ensureJailbreakRootExists;
+- (NSError *)ensureJailbreakRootExists;
 
 
 - (void)runUnsandboxed:(void (^)(void))unsandboxBlock;

diff --git a/Application/Dopamine/Jailbreak/DOEnvironmentManager.m b/Application/Dopamine/Jailbreak/DOEnvironmentManager.m
@@ -148,8 +148,10 @@ - (void)locateJailbreakRoot
     }
 }
 
-- (void)ensureJailbreakRootExists
+- (NSError *)ensureJailbreakRootExists
 {
+    NSError *error = nil;
+
     [self locateJailbreakRoot];
 
     if (!gSystemInfo.jailbreakInfo.rootPath || _bootstrapNeedsMigration) {
@@ -172,16 +174,20 @@ - (void)ensureJailbreakRootExists
 
         if (_bootstrapNeedsMigration) {
             NSString *oldRandomizedJailbreakPath = [[NSString stringWithUTF8String:gSystemInfo.jailbreakInfo.rootPath] stringByDeletingLastPathComponent];
-            [[NSFileManager defaultManager] moveItemAtPath:oldRandomizedJailbreakPath toPath:randomizedJailbreakPath error:nil];
+            [[NSFileManager defaultManager] moveItemAtPath:oldRandomizedJailbreakPath toPath:randomizedJailbreakPath error:&error];
         }
         else {
             if (![[NSFileManager defaultManager] fileExistsAtPath:jailbreakRootPath]) {
-                [[NSFileManager defaultManager] createDirectoryAtPath:jailbreakRootPath withIntermediateDirectories:YES attributes:nil error:nil];
+                [[NSFileManager defaultManager] createDirectoryAtPath:jailbreakRootPath withIntermediateDirectories:YES attributes:nil error:&error];
             }
         }
 
-        gSystemInfo.jailbreakInfo.rootPath = strdup(jailbreakRootPath.UTF8String);
+        if (!error) {
+            gSystemInfo.jailbreakInfo.rootPath = strdup(jailbreakRootPath.UTF8String);
+        }
     }
+
+    return error;
 }
 
 - (BOOL)isArm64e

diff --git a/Application/Dopamine/Jailbreak/DOJailbreaker.m b/Application/Dopamine/Jailbreak/DOJailbreaker.m
@@ -29,6 +29,7 @@
 #import <libjailbreak/jbclient_xpc.h>
 #import <libjailbreak/kcall_arm64.h>
 #import <CoreServices/LSApplicationProxy.h>
+#import <sys/utsname.h>
 #import "spawn.h"
 int posix_spawnattr_set_registered_ports_np(posix_spawnattr_t * __restrict attr, mach_port_t portarray[], uint32_t count);
 
@@ -477,6 +478,11 @@ - (void)runWithError:(NSError **)errOut didRemoveJailbreak:(BOOL*)didRemove show
     BOOL idownloadEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"idownloadEnabled" fallback:NO];
     BOOL appJITEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"appJITEnabled" fallback:YES];
 
+    struct utsname systemInfo;
+    uname(&systemInfo);
+    NSString *startLog = [NSString stringWithFormat:@"Starting Jailbreak (Model: %s, %@, Configuration: {removeJailbreak=%d, tweakInjection=%d, idownload=%d, appJIT=%d})", systemInfo.machine, NSProcessInfo.processInfo.operatingSystemVersionString, removeJailbreakEnabled, tweaksEnabled, idownloadEnabled, appJITEnabled];
+    [[DOUIManager sharedInstance] sendLog:startLog debug:YES];
+
     *errOut = [self gatherSystemInformation];
     if (*errOut) return;
     *errOut = [self doExploitation];
@@ -503,7 +509,8 @@ - (void)runWithError:(NSError **)errOut didRemoveJailbreak:(BOOL*)didRemove show
     if (*errOut) return;
 
     // Now that we are unsandboxed, populate the jailbreak root path
-    [[DOEnvironmentManager sharedManager] ensureJailbreakRootExists];
+    *errOut = [[DOEnvironmentManager sharedManager] ensureJailbreakRootExists];
+    if (*errOut) return;
 
     if (removeJailbreakEnabled) {
         [[DOUIManager sharedInstance] sendLog:DOLocalizedString(@"Removing Jailbreak") debug:NO];