Skip to content

Commit

Permalink
2.2.2 long overdue
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElliesSurviving
ElliesSurviving authored Aug 21, 2024
1 parent 8926838 commit d6710a6
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 94 deletions.
4 changes: 2 additions & 2 deletions Application/Dopamine.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2295,7 +2295,7 @@
"$(PROJECT_DIR)/Dopamine/Dependencies",
"$(PROJECT_DIR)/Dopamine/Resources",
);
MARKETING_VERSION = 2.2.1;
MARKETING_VERSION = 2.2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.opa334.Dopamine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -2332,7 +2332,7 @@
"$(PROJECT_DIR)/Dopamine/Dependencies",
"$(PROJECT_DIR)/Dopamine/Resources",
);
MARKETING_VERSION = 2.2.1;
MARKETING_VERSION = 2.2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.opa334.Dopamine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
4 changes: 2 additions & 2 deletions Application/Dopamine/Jailbreak/DOEnvironmentManager.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,10 @@ - (BOOL)isArm64e
- (NSString *)versionSupportString
{
if ([self isArm64e]) {
return @"iOS 15.0 - 16.5.1 (arm64e), v2.2.1-Nightly.2";
return @"iOS 15.0 - 16.5.1 (arm64e), v2.2.2-Release";
}
else {
return @"iOS 15.0 - 16.6.1 (arm64), v2.2.1-Nightly.2";
return @"iOS 15.0 - 16.6.1 (arm64), v2.2.2-Release";
}
}

Expand Down
2 changes: 1 addition & 1 deletion BaseBin/_external/basebin/.version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.1
2.2.2
2 changes: 1 addition & 1 deletion BaseBin/launchdhook/src/spawn_hook.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ int __posix_spawn_hook(pid_t *restrict pid, const char *restrict path,
}
}

return spawn_hook_common(pid, path, desc, argv, envp, __posix_spawn_orig_wrapper, systemwide_trust_binary, platform_set_process_debugged, jbsetting(jetsamMultiplier));
return posix_spawn_hook_shared(pid, path, desc, argv, envp, __posix_spawn_orig_wrapper, systemwide_trust_binary, platform_set_process_debugged, jbsetting(jetsamMultiplier));
}

void initSpawnHooks(void)
Expand Down
113 changes: 53 additions & 60 deletions BaseBin/systemhook/src/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,24 +99,26 @@ int __posix_spawn_orig(pid_t *restrict pid, const char *restrict path, struct _p
return syscall(SYS_posix_spawn, pid, path, desc, argv, envp);
}

int __execve_orig(const char *path, char *const argv[], char *const envp[])
{
return syscall(SYS_execve, path, argv, envp);
}


// 1. Ensure the binary about to be spawned and all of it's dependencies are trust cached
// 2. Insert "DYLD_INSERT_LIBRARIES=/usr/lib/systemhook.dylib" into all binaries spawned
// 3. Increase Jetsam limit to more sane value (Multipler defined as JETSAM_MULTIPLIER)

int spawn_hook_common(pid_t *restrict pid, const char *restrict path,
struct _posix_spawn_args_desc *desc,
char *const argv[restrict],
char *const envp[restrict],
void *orig,
int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray),
int (*set_process_debugged)(uint64_t pid, bool fullyDebugged),
double jetsamMultiplier)
static int spawn_exec_hook_common(const char *path,
char *const argv[restrict],
char *const envp[restrict],
struct _posix_spawn_args_desc *desc,
int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray),
double jetsamMultiplier,
int (^orig)(char *const envp[restrict]))
{
int (*pspawn_orig)(pid_t *restrict, const char *restrict, struct _posix_spawn_args_desc *, char *const[restrict], char *const[restrict]) = orig;
if (!path) {
return pspawn_orig(pid, path, desc, argv, envp);
return orig(envp);
}

posix_spawnattr_t attr = NULL;
Expand Down Expand Up @@ -234,59 +236,15 @@ int spawn_hook_common(pid_t *restrict pid, const char *restrict path,
*(int*)(attrStruct + POSIX_SPAWNATTR_OFF_MEMLIMIT_INACTIVE) = memlimit_inactive * jetsamMultiplier;
}
}
// On iOS 16, disable launch constraints
// Not working, doesn't seem feasable
// if (__builtin_available(iOS 16.0, *)) {
// uint32_t bufsize = PATH_MAX;
// char executablePath[PATH_MAX];
// _NSGetExecutablePath(executablePath, &bufsize);
// // We could do the following here
// // posix_spawnattr_set_launch_type_np(*attrp, 0);
// // But I don't know how to get the compiler to weak link it
// // So we just set it by offset
// if (getpid() == 1) {
// FILE *f = fopen("/var/mobile/launch_type.txt", "a");
// const char *toLog = path;
// if (!strcmp(path, "/usr/libexec/xpcproxy") && argv) {
// if (argv[0]) {
// if (argv[1]) {
// toLog = argv[1];
// }
// }
// }
// fprintf(f, "%s has launch type %u\n", toLog, *(uint8_t *)(attrStruct + POSIX_SPAWNATTR_OFF_LAUNCH_TYPE));
// fclose(f);
// }
// else if (!strcmp(executablePath, "/usr/libexec/xpcproxy")) {
// FILE *f = fopen("/tmp/launch_type_xpcproxy.txt", "a");
// if (f) {
// fprintf(f, "%s has launch type %u\n", path, *(uint8_t *)(attrStruct + POSIX_SPAWNATTR_OFF_LAUNCH_TYPE));
// fclose(f);
// }
// }
// else {
// os_log(OS_LOG_DEFAULT, "systemhook %{public}s has launch type %u\n", path, *(uint8_t *)(attrStruct + POSIX_SPAWNATTR_OFF_LAUNCH_TYPE));
// }

// *(uint8_t *)(attrStruct + POSIX_SPAWNATTR_OFF_LAUNCH_TYPE) = ...
// if (!strcmp(path, "/usr/libexec/xpcproxy") && argv) {
// if (argv[0]) {
// if (argv[1]) {
// if (string_has_prefix(argv[1], "com.apple.WebKit.WebContent.")) {
// *(uint8_t *)(attrStruct + POSIX_SPAWNATTR_OFF_LAUNCH_TYPE) = 0;
// }
// }
// }
// }
// }

}
}

int retval = -1;
int r = -1;

if ((shouldInsertJBEnv && JBEnvAlreadyInsertedCount == 1) || (!shouldInsertJBEnv && JBEnvAlreadyInsertedCount == 0 && !hasSafeModeVariable)) {
// we're already good, just call orig
retval = pspawn_orig(pid, path, desc, argv, envp);
r = orig(envp);
}
else {
// the state we want to be in is not the state we are in right now
Expand Down Expand Up @@ -335,11 +293,31 @@ int spawn_hook_common(pid_t *restrict pid, const char *restrict path,
envbuf_unsetenv(&envc, "_MSSafeMode");
}

retval = pspawn_orig(pid, path, desc, argv, envc);
r = orig(envc);
envbuf_free(envc);
}

if (retval == 0 && pid != NULL) {
return r;
}

int posix_spawn_hook_shared(pid_t *restrict pid,
const char *restrict path,
struct _posix_spawn_args_desc *desc,
char *const argv[restrict],
char *const envp[restrict],
void *orig,
int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray),
int (*set_process_debugged)(uint64_t pid, bool fullyDebugged),
double jetsamMultiplier)
{
int (*posix_spawn_orig)(pid_t *restrict, const char *restrict, struct _posix_spawn_args_desc *, char *const[restrict], char *const[restrict]) = orig;

int r = spawn_exec_hook_common(path, argv, envp, desc, trust_binary, jetsamMultiplier, ^int(char *const envp_patched[restrict]){
return posix_spawn_orig(pid, path, desc, argv, envp_patched);
});

if (r == 0 && pid && desc) {
posix_spawnattr_t attr = desc->attrp;
short flags = 0;
if (posix_spawnattr_getflags(&attr, &flags) == 0) {
if (flags & POSIX_SPAWN_START_SUSPENDED) {
Expand All @@ -351,5 +329,20 @@ int spawn_hook_common(pid_t *restrict pid, const char *restrict path,
}
}

return retval;
return r;
}

int execve_hook_shared(const char *path,
char *const argv[],
char *const envp[],
void *orig,
int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray))
{
int (*execve_orig)(const char *, char *const[], char *const[]) = orig;

int r = spawn_exec_hook_common(path, argv, envp, NULL, trust_binary, 0, ^int(char *const envp_patched[restrict]){
return execve_orig(path, argv, envp_patched);
});

return r;
}
10 changes: 2 additions & 8 deletions BaseBin/systemhook/src/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,5 @@ bool string_has_suffix(const char* str, const char* suffix);
int __posix_spawn_orig(pid_t *restrict pid, const char *restrict path, struct _posix_spawn_args_desc *desc, char *const argv[restrict], char * const envp[restrict]);

int resolvePath(const char *file, const char *searchPath, int (^attemptHandler)(char *path));
int spawn_hook_common(pid_t *restrict pid, const char *restrict path,
struct _posix_spawn_args_desc *desc,
char *const argv[restrict],
char *const envp[restrict],
void *orig,
int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray),
int (*set_process_debugged)(uint64_t pid, bool fullyDebugged),
double jetsamMultiplier);
int posix_spawn_hook_shared(pid_t *restrict pid, const char *restrict path, struct _posix_spawn_args_desc *desc, char *const argv[restrict], char *const envp[restrict], void *orig, int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray), int (*set_process_debugged)(uint64_t pid, bool fullyDebugged), double jetsamMultiplier);
int execve_hook_shared(const char *path, char *const argv[], char *const envp[], void *orig, int (*trust_binary)(const char *path, xpc_object_t preferredArchsArray));
24 changes: 4 additions & 20 deletions BaseBin/systemhook/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void* dyld_dlopen_hook(void *dyld, const char* path, int mode)
if (path && !(mode & RTLD_NOLOAD)) {
jbclient_trust_library(path, __builtin_return_address(0));
}
return dyld_dlopen_orig(dyld, path, mode);
__attribute__((musttail)) return dyld_dlopen_orig(dyld, path, mode);
}

void* (*dyld_dlopen_from_orig)(void *dyld, const char* path, int mode, void* addressInCaller);
Expand Down Expand Up @@ -255,34 +255,18 @@ bool should_enable_tweaks(void)

int __posix_spawn_hook(pid_t *restrict pid, const char *restrict path, struct _posix_spawn_args_desc *desc, char *const argv[restrict], char * const envp[restrict])
{
return spawn_hook_common(pid, path, desc, argv, envp, (void *)__posix_spawn_orig, jbclient_trust_binary, jbclient_platform_set_process_debugged, jbclient_jbsettings_get_double("jetsamMultiplier"));
return posix_spawn_hook_shared(pid, path, desc, argv, envp, (void *)__posix_spawn_orig, jbclient_trust_binary, jbclient_platform_set_process_debugged, jbclient_jbsettings_get_double("jetsamMultiplier"));
}

int __posix_spawn_hook_with_filter(pid_t *restrict pid, const char *restrict path, char *const argv[restrict], char * const envp[restrict], struct _posix_spawn_args_desc *desc, int *ret)
{
*ret = spawn_hook_common(pid, path, desc, argv, envp, (void *)__posix_spawn_orig, jbclient_trust_binary, jbclient_platform_set_process_debugged, jbclient_jbsettings_get_double("jetsamMultiplier"));
*ret = posix_spawn_hook_shared(pid, path, desc, argv, envp, (void *)__posix_spawn_orig, jbclient_trust_binary, jbclient_platform_set_process_debugged, jbclient_jbsettings_get_double("jetsamMultiplier"));
return 1;
}

int __execve_hook(const char *path, char *const argv[], char *const envp[])
{
// For execve, just make it call posix_spawn instead
// Since posix_spawn is hooked, all the logic will happen in there

posix_spawnattr_t attr = NULL;
posix_spawnattr_init(&attr);
posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETEXEC);
int result = posix_spawn(NULL, path, NULL, &attr, argv, envp);
if (attr) {
posix_spawnattr_destroy(&attr);
}

if(result != 0) { // posix_spawn will return errno and restore errno if it fails
errno = result; // so we need to set errno by ourself
return -1;
}

return result;
return execve_hook_shared(path, argv, envp, (void *)__execve_orig, jbclient_trust_binary);
}

__attribute__((constructor)) static void initializer(void)
Expand Down

0 comments on commit d6710a6

Please sign in to comment.