Add 'Allow JIT in Apps' option, sort exploits by their recommendation

opa334 · Apr 29, 2024 · 1d6da8f · 1d6da8f
1 parent 8a85235
commit 1d6da8f
Show file tree

Hide file tree

Showing 39 changed files with 228 additions and 18 deletions.
diff --git a/Application/Dopamine/Jailbreak/DOJailbreaker.m b/Application/Dopamine/Jailbreak/DOJailbreaker.m
@@ -484,12 +484,15 @@ - (void)runWithError:(NSError **)errOut didRemoveJailbreak:(BOOL*)didRemove show
     BOOL removeJailbreakEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"removeJailbreakEnabled" fallback:NO];
     BOOL tweaksEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"tweakInjectionEnabled" fallback:YES];
     BOOL idownloadEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"idownloadEnabled" fallback:NO];
+    BOOL appJITEnabled = [[DOPreferenceManager sharedManager] boolPreferenceValueForKey:@"appJITEnabled" fallback:YES];
 
     *errOut = [self gatherSystemInformation];
     if (*errOut) return;
     *errOut = [self doExploitation];
     if (*errOut) return;
 
+    gSystemInfo.jailbreakSettings.markAppsAsDebugged = appJITEnabled;
+
     [[DOUIManager sharedInstance] sendLog:DOLocalizedString(@"Building Phys R/W Primitive") debug:NO];
     *errOut = [self buildPhysRWPrimitive];
     if (*errOut) return;

diff --git a/Application/Dopamine/UI/Settings/DOSettingsController.m b/Application/Dopamine/UI/Settings/DOSettingsController.m
@@ -65,24 +65,24 @@ - (NSArray *)availableKernelExploitNames
 - (NSArray *)availablePACBypassIdentifiers
 {
     NSMutableArray *identifiers = [NSMutableArray new];
-    for (DOExploit *exploit in _availablePACBypasses) {
-        [identifiers addObject:exploit.identfier];
-    }
     if (![DOEnvironmentManager sharedManager].isPACBypassRequired) {
         [identifiers addObject:@"none"];
     }
+    for (DOExploit *exploit in _availablePACBypasses) {
+        [identifiers addObject:exploit.identfier];
+    }
     return identifiers;
 }
 
 - (NSArray *)availablePACBypassNames
 {
     NSMutableArray *names = [NSMutableArray new];
+    if (![DOEnvironmentManager sharedManager].isPACBypassRequired) {
+        [names addObject:DOLocalizedString(@"None")];
+    }
     for (DOExploit *exploit in _availablePACBypasses) {
         [names addObject:exploit.name];
     }
-    if (![DOEnvironmentManager sharedManager].isPACBypassRequired) {
-        [names addObject:@"None"];
-    }
     return names;
 }
 
@@ -124,10 +124,12 @@ - (id)specifiers
         SEL defGetter = @selector(readPreferenceValue:);
         SEL defSetter = @selector(setPreferenceValue:specifier:);
 
-        _availableKernelExploits = [exploitManager availableExploitsForType:EXPLOIT_TYPE_KERNEL].allObjects;
+        NSSortDescriptor *prioritySortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"priority" ascending:NO];
+
+        _availableKernelExploits = [[exploitManager availableExploitsForType:EXPLOIT_TYPE_KERNEL] sortedArrayUsingDescriptors:@[prioritySortDescriptor]];
         if (envManager.isArm64e) {
-            _availablePACBypasses = [exploitManager availableExploitsForType:EXPLOIT_TYPE_PAC].allObjects;
-            _availablePPLBypasses = [exploitManager availableExploitsForType:EXPLOIT_TYPE_PPL].allObjects;
+            _availablePACBypasses = [[exploitManager availableExploitsForType:EXPLOIT_TYPE_PAC] sortedArrayUsingDescriptors:@[prioritySortDescriptor]];
+            _availablePPLBypasses = [[exploitManager availableExploitsForType:EXPLOIT_TYPE_PPL] sortedArrayUsingDescriptors:@[prioritySortDescriptor]];
         }
 
         PSSpecifier *headerSpecifier = [PSSpecifier emptyGroupSpecifier];
@@ -201,6 +203,12 @@ - (id)specifiers
             [idownloadSpecifier setProperty:@NO forKey:@"default"];
             [specifiers addObject:idownloadSpecifier];
 
+            PSSpecifier *appJitSpecifier = [PSSpecifier preferenceSpecifierNamed:DOLocalizedString(@"Settings_Apps_JIT") target:self set:@selector(setAppJITEnabled:specifier:) get:@selector(readAppJITEnabled:) detail:nil cell:PSSwitchCell edit:nil];
+            [appJitSpecifier setProperty:@YES forKey:@"enabled"];
+            [appJitSpecifier setProperty:@"appJITEnabled" forKey:@"key"];
+            [appJitSpecifier setProperty:@YES forKey:@"default"];
+            [specifiers addObject:appJitSpecifier];
+
             if (!envManager.isJailbroken && !envManager.isInstalledThroughTrollStore) {
                 PSSpecifier *removeJailbreakSwitchSpecifier = [PSSpecifier preferenceSpecifierNamed:DOLocalizedString(@"Button_Remove_Jailbreak") target:self set:@selector(setRemoveJailbreakEnabled:specifier:) get:defGetter detail:nil cell:PSSwitchCell edit:nil];
                 [removeJailbreakSwitchSpecifier setProperty:@YES forKey:@"enabled"];
@@ -359,6 +367,25 @@ - (void)setTweakInjectionEnabled:(id)value specifier:(PSSpecifier *)specifier
     }
 }
 
+- (id)readAppJITEnabled:(PSSpecifier *)specifier
+{
+    DOEnvironmentManager *envManager = [DOEnvironmentManager sharedManager];
+    if (envManager.isJailbroken) {
+        bool v = jbclient_platform_jbsettings_get_bool("markAppsAsDebugged");
+        return @(v);
+    }
+    return [self readPreferenceValue:specifier];
+}
+
+- (void)setAppJITEnabled:(id)value specifier:(PSSpecifier *)specifier
+{
+    [self setPreferenceValue:value specifier:specifier];
+    DOEnvironmentManager *envManager = [DOEnvironmentManager sharedManager];
+    if (envManager.isJailbroken) {
+        jbclient_platform_jbsettings_set_bool("markAppsAsDebugged", ((NSNumber *)value).boolValue);
+    }
+}
+
 - (void)setRemoveJailbreakEnabled:(id)value specifier:(PSSpecifier *)specifier
 {
     [self setPreferenceValue:value specifier:specifier];

diff --git a/Application/Dopamine/UI/Settings/PSLists/DOPSListController.m b/Application/Dopamine/UI/Settings/PSLists/DOPSListController.m
@@ -17,7 +17,6 @@ @implementation DOPSListController
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-
     [_table setSeparatorColor:[UIColor clearColor]];
     [_table setBackgroundColor:[UIColor clearColor]];
     [DOPSListController setupViewControllerStyle:self];

diff --git a/Application/Dopamine/ar.lproj/Localizable.strings b/Application/Dopamine/ar.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "تشغيل الأدوات";
 "Settings_iDownload" = "iDownload (محطة المطور)";
 "Settings_Verbose_Logs" = "السجلات المطولة";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "إزالة الجيلبريك";

diff --git a/Application/Dopamine/da.lproj/Localizable.strings b/Application/Dopamine/da.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak-injektion";
 "Settings_iDownload" = "iDownload (Udviklerterminal)";
 "Settings_Verbose_Logs" = "Detaljerede logfiler";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Fjern Jailbreak";

diff --git a/Application/Dopamine/de.lproj/Localizable.strings b/Application/Dopamine/de.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweaks laden";
 "Settings_iDownload" = "iDownload (Entwickler-Terminal)";
 "Settings_Verbose_Logs" = "Detaillierte Logs";
+"Settings_Apps_JIT" = "Erlaube JIT in Apps";
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Jailbreak entfernen";

diff --git a/Application/Dopamine/el.lproj/Localizable.strings b/Application/Dopamine/el.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Ενσωμάτωση Tweak";
 "Settings_iDownload" = "iDownload (Τερματικό προγραμματιστή)";
 "Settings_Verbose_Logs" = "Λεπτομερής καταγραφή";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Αφαίρεση Jailbreak";

diff --git a/Application/Dopamine/en.lproj/Localizable.strings b/Application/Dopamine/en.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (Developer Shell)";
 "Settings_Verbose_Logs" = "Verbose Logs";
+"Settings_Apps_JIT" = "Allow JIT in Apps";
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Remove Jailbreak";

diff --git a/Application/Dopamine/es.lproj/Localizable.strings b/Application/Dopamine/es.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Inyección de ajustes";
 "Settings_iDownload" = "iDownload (Shell de desarrollador)";
 "Settings_Verbose_Logs" = "Registros detallados";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Eliminar Jailbreak";

diff --git a/Application/Dopamine/fil.lproj/Localizable.strings b/Application/Dopamine/fil.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (Terminal ng Developer)";
 "Settings_Verbose_Logs" = "Mga Verbose Logs";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Tanggalin ang Jailbreak";

diff --git a/Application/Dopamine/fr.lproj/Localizable.strings b/Application/Dopamine/fr.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Injection de tweaks";
 "Settings_iDownload" = "iDownload (Outil de dev)";
 "Settings_Verbose_Logs" = "Mode verbose";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Supprimer le jailbreak";

diff --git a/Application/Dopamine/it.lproj/Localizable.strings b/Application/Dopamine/it.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Iniezione Tweak";
 "Settings_iDownload" = "iDownload (Terminal per sviluppatori)";
 "Settings_Verbose_Logs" = "Log Dettagliati";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Rimuovi il Jailbreak";

diff --git a/Application/Dopamine/ja.lproj/Localizable.strings b/Application/Dopamine/ja.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (開発者用シェル)";
 "Settings_Verbose_Logs" = "詳細なログ";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Jailbreak環境の削除";

diff --git a/Application/Dopamine/kk.lproj/Localizable.strings b/Application/Dopamine/kk.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Твиктерді енгізу";
 "Settings_iDownload" = "iDownload (Әзірлеуші терминалы)";
 "Settings_Verbose_Logs" = "Кеңейтілген журналдар";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Джейлбрейкті жою";

diff --git a/Application/Dopamine/ko.lproj/Localizable.strings b/Application/Dopamine/ko.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "트윅 주입";
 "Settings_iDownload" = "iDownload (개발자 터미널)";
 "Settings_Verbose_Logs" = "로그";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "탈옥 제거";

diff --git a/Application/Dopamine/main.m b/Application/Dopamine/main.m
@@ -36,7 +36,7 @@ int main(int argc, char * argv[]) {
 
     // If systemhook isn't loaded and we are already jailbroken, we need to do the checkin ourselves
     // This can happen when the jailbreak is hidden or when tweak injection into the Dopamine app is disabled via Choicy
-    jbclient_process_checkin(NULL, NULL, NULL);
+    jbclient_process_checkin(NULL, NULL, NULL, NULL);
 
     if ([DOEnvironmentManager sharedManager].isJailbroken) {
         setenv("PATH", "/sbin:/bin:/usr/sbin:/usr/bin:/var/jb/sbin:/var/jb/bin:/var/jb/usr/sbin:/var/jb/usr/bin", 1);

diff --git a/Application/Dopamine/nl.lproj/Localizable.strings b/Application/Dopamine/nl.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (Ontwikkelaar Terminal)";
 "Settings_Verbose_Logs" = "Uitgebreide logs";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Jailbreak verwijderen";

diff --git a/Application/Dopamine/pl.lproj/Localizable.strings b/Application/Dopamine/pl.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Wstrzykiwanie tweaków";
 "Settings_iDownload" = "iDownload (terminal dla deweloperów)";
 "Settings_Verbose_Logs" = "Logi verbose";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Usuń jailbreak";

diff --git a/Application/Dopamine/pt-BR.lproj/Localizable.strings b/Application/Dopamine/pt-BR.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Injeção de Tweaks";
 "Settings_iDownload" = "iDownload (Terminal de desenvolvedor)";
 "Settings_Verbose_Logs" = "Logs do Verbose";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Remover o Jailbreak";

diff --git a/Application/Dopamine/ru.lproj/Localizable.strings b/Application/Dopamine/ru.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Внедрение твиков";
 "Settings_iDownload" = "iDownload (Терминал разработчика)";
 "Settings_Verbose_Logs" = "Расширенные логи";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Удалить джейлбрейк";

diff --git a/Application/Dopamine/sv.lproj/Localizable.strings b/Application/Dopamine/sv.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (Terminal för utvecklare)";
 "Settings_Verbose_Logs" = "Omfattande loggar";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Ta Bot Jailbreak";

diff --git a/Application/Dopamine/th.lproj/Localizable.strings b/Application/Dopamine/th.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (Developer Shell)";
 "Settings_Verbose_Logs" = "Verbose Logs";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "ลบเจลเบรค";

diff --git a/Application/Dopamine/tr.lproj/Localizable.strings b/Application/Dopamine/tr.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Enjeksiyonu";
 "Settings_iDownload" = "iDownload (Geliştirici Terminali)";
 "Settings_Verbose_Logs" = "Sözlü Loglar";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Jailbreak'i Sil";

diff --git a/Application/Dopamine/uk.lproj/Localizable.strings b/Application/Dopamine/uk.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "ін'єкція твiков";
 "Settings_iDownload" = "iDownload (Термінал розробника)";
 "Settings_Verbose_Logs" = "Докладні логи";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Видалити джейлбрейк";

diff --git a/Application/Dopamine/ur.lproj/Localizable.strings b/Application/Dopamine/ur.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Tweak Injection";
 "Settings_iDownload" = "iDownload (ڈویلپر ٹرمینل)";
 "Settings_Verbose_Logs" = "Verbose Logs";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = " جیل بریک اتارلو";

diff --git a/Application/Dopamine/vi.lproj/Localizable.strings b/Application/Dopamine/vi.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "Cho phép chạy Tweak";
 "Settings_iDownload" = "iDownload (nhà phát triển)";
 "Settings_Verbose_Logs" = "Hiện Log dạng phức tạp";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "Gỡ Jailbreak";

diff --git a/Application/Dopamine/zh-CN.lproj/Localizable.strings b/Application/Dopamine/zh-CN.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "插件注入";
 "Settings_iDownload" = "iDownload (开发者终端)";
 "Settings_Verbose_Logs" = "详细日志";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "移除越狱";

diff --git a/Application/Dopamine/zh-HK.lproj/Localizable.strings b/Application/Dopamine/zh-HK.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "插件注入";
 "Settings_iDownload" = "iDownload (开发商终端)";
 "Settings_Verbose_Logs" = "詳細日誌";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "清除越獄";

diff --git a/Application/Dopamine/zh-Hans.lproj/Localizable.strings b/Application/Dopamine/zh-Hans.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "插件注入";
 "Settings_iDownload" = "iDownload (开发者终端)";
 "Settings_Verbose_Logs" = "详细日志";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "移除越狱";

diff --git a/Application/Dopamine/zh-TW.lproj/Localizable.strings b/Application/Dopamine/zh-TW.lproj/Localizable.strings
@@ -41,6 +41,7 @@
 "Settings_Tweak_Injection" = "載入插體";
 "Settings_iDownload" = "iDownload (開發者终端)";
 "Settings_Verbose_Logs" = "詳細日誌";
+/*Settings_Apps_JIT*/
 
 // Settings Buttons
 "Button_Remove_Jailbreak" = "移除越獄";

diff --git a/BaseBin/launchdhook/src/jbserver/jbdomain_platform.c b/BaseBin/launchdhook/src/jbserver/jbdomain_platform.c
@@ -28,6 +28,24 @@ static int platform_stage_jailbreak_update(const char *updateTar)
 	return 1;
 }
 
+static int platform_jbsettings_get(const char *key, xpc_object_t *valueOut)
+{
+	if (!strcmp(key, "markAppsAsDebugged")) {
+		*valueOut = xpc_bool_create(jbsetting(markAppsAsDebugged));
+		return 0;
+	}
+	return -1;
+}
+
+static int platform_jbsettings_set(const char *key, xpc_object_t value)
+{
+	if (!strcmp(key, "markAppsAsDebugged") && xpc_get_type(value) == XPC_TYPE_BOOL) {
+		gSystemInfo.jailbreakSettings.markAppsAsDebugged = xpc_bool_get_value(value);
+		return 0;
+	}
+	return -1;
+}
+
 struct jbserver_domain gPlatformDomain = {
 	.permissionHandler = platform_domain_allowed,
 	.actions = {
@@ -48,6 +66,22 @@ struct jbserver_domain gPlatformDomain = {
 				{ 0 },
 			},
 		},
+		// JBS_PLATFORM_JBSETTINGS_GET
+		{
+			.handler = platform_jbsettings_get,
+			.args = (jbserver_arg[]){
+				{ .name = "key", .type = JBS_TYPE_STRING, .out = false },
+				{ .name = "value", .type = JBS_TYPE_XPC_GENERIC, .out = true },
+			},
+		},
+		// JBS_PLATFORM_JBSETTINGS_SET
+		{
+			.handler = platform_jbsettings_set,
+			.args = (jbserver_arg[]){
+				{ .name = "key", .type = JBS_TYPE_STRING, .out = false },
+				{ .name = "value", .type = JBS_TYPE_XPC_GENERIC, .out = false },
+			},
+		},
 		{ 0 },
 	},
 };