Master

Makefile

@@ -2,23 +2,57 @@ LIBRARY_NAME = librocketbootstrap
 librocketbootstrap_FILES = Tweak.x Shims.x
 librocketbootstrap_LIBRARIES = substrate
 librocketbootstrap_FRAMEWORKS = Foundation
+librocketbootstrap_USE_MODULES = 0
 
-TOOL_NAME = rocketd
+TOOL_NAME = rocketd _rocketd_reenable
 rocketd_FILES = rocketd.c
+rocketd_CFLAGS = -fblocks
 rocketd_FRAMEWORKS = CoreFoundation
 rocketd_INSTALL_PATH = /usr/libexec
-rocketd_IPHONE_ARCHS = armv6 arm64
+rocketd_USE_MODULES = 0
+rocketd_CODESIGN_FLAGS = -Sentitlements.xml
 
-ADDITIONAL_CFLAGS = -std=c99
+_rocketd_reenable_FILES = rocketd_reenable.c
+_rocketd_reenable_INSTALL_PATH = /usr/libexec
+_rocketd_reenable_USE_MODULES = 0
+_rocketd_reenable_CODESIGN_FLAGS = -Sentitlements.xml
 
-IPHONE_ARCHS = armv6 armv7 armv7s arm64
+ADDITIONAL_CFLAGS = -std=c99 -Ioverlayheaders
 
-SDKVERSION_armv6 = 5.1
-INCLUDE_SDKVERSION_armv6 = 7.0
-TARGET_IPHONEOS_DEPLOYMENT_VERSION = 4.0
+# Support targeting 3.0 in packaged builds, but allow testing packages/builds to be missing support for old iOS versions
+XCODE4_PATH ?= /Applications/Xcode_Legacy.app
+XCODE6_PATH ?= /Volumes/Xcode/Xcode.app
+XCODE9_PATH ?= /Volumes/Xcode_9.4.1/Xcode.app
 
+ifeq ($(wildcard $(XCODE4_PATH)/.*),)
+ADDITIONAL_CFLAGS += -Idefaultheaders
+IPHONE_ARCHS = armv7 armv7s arm64 arm64e
+TARGET_IPHONEOS_DEPLOYMENT_VERSION = 8.4
+ifeq ($(FINALPACKAGE),1)
+$(error Building final package requires a legacy Xcode install!)
+endif
+else
+armv6_CFLAGS += -Ifullheaders
+armv7_CFLAGS += -Ifullheaders
+armv7s_CFLAGS += -Ifullheaders
+arm64_CFLAGS += -Idefaultheaders
+arm64e_CFLAGS += -Idefaultheaders
+rocketd_IPHONE_ARCHS = armv6 arm64
+_rocketd_reenable_IPHONE_ARCHS = armv6 arm64
+IPHONE_ARCHS = armv6 armv7 armv7s arm64 arm64e
+SDKVERSION_armv6 = 5.1
+INCLUDE_SDKVERSION_armv6 = 8.4
 TARGET_IPHONEOS_DEPLOYMENT_VERSION_armv6 = 3.0
-THEOS_PLATFORM_SDK_ROOT_armv6 = /Applications/Xcode_Legacy.app/Contents/Developer
+TARGET_IPHONEOS_DEPLOYMENT_VERSION_armv7 = 4.0
+TARGET_IPHONEOS_DEPLOYMENT_VERSION_armv7s = 6.0
+TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64 = 7.0
+TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64e = 12.0
+TARGET_IPHONEOS_DEPLOYMENT_VERSION = 9.0
+THEOS_PLATFORM_SDK_ROOT_armv6 = $(XCODE4_PATH)/Contents/Developer
+THEOS_PLATFORM_SDK_ROOT_armv7 = $(XCODE6_PATH)/Contents/Developer
+THEOS_PLATFORM_SDK_ROOT_armv7s = $(XCODE6_PATH)/Contents/Developer
+THEOS_PLATFORM_SDK_ROOT_arm64 = $(XCODE9_PATH)/Contents/Developer
+endif
 
 include framework/makefiles/common.mk
 include framework/makefiles/library.mk
@@ -28,3 +62,4 @@ stage::
 	mkdir -p "$(THEOS_STAGING_DIR)/usr/include"
 	cp -a rocketbootstrap.h rocketbootstrap_dynamic.h "$(THEOS_STAGING_DIR)/usr/include"
 	plutil -convert binary1 "$(THEOS_STAGING_DIR)/Library/MobileSubstrate/DynamicLibraries/RocketBootstrap.plist"
+	plutil -convert binary1 "$(THEOS_STAGING_DIR)/Library/LaunchDaemons/com.rpetrich.rocketbootstrapd.plist"

Shims.x

@@ -1,15 +1,17 @@
+#import "log.h"
+#import "unfair_lock.h"
 #import "rocketbootstrap_internal.h"
 
 #import <CaptainHook/CaptainHook.h>
 #import <libkern/OSAtomic.h>
 #import <substrate.h>
 
-static OSSpinLock spin_lock;
+static unfair_lock shim_lock;
 
 kern_return_t bootstrap_look_up3(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, const uuid_t instance_id, uint64_t flags) __attribute__((weak_import));
-kern_return_t (*_bootstrap_look_up3)(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, const uuid_t instance_id, uint64_t flags);
+static kern_return_t (*_bootstrap_look_up3)(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, const uuid_t instance_id, uint64_t flags);
 
-kern_return_t $bootstrap_look_up3(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, const uuid_t instance_id, uint64_t flags)
+static kern_return_t $bootstrap_look_up3(mach_port_t bp, const name_t service_name, mach_port_t *sp, pid_t target_pid, const uuid_t instance_id, uint64_t flags)
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSMutableDictionary *threadDictionary = [NSThread currentThread].threadDictionary;
@@ -26,12 +28,12 @@ kern_return_t $bootstrap_look_up3(mach_port_t bp, const name_t service_name, mac
 static void hook_bootstrap_lookup(void)
 {
 	static bool hooked_bootstrap_look_up;
-	OSSpinLockLock(&spin_lock);
+	unfair_lock_lock(&shim_lock);
 	if (!hooked_bootstrap_look_up) {
 		MSHookFunction(bootstrap_look_up3, $bootstrap_look_up3, (void **)&_bootstrap_look_up3);
 		hooked_bootstrap_look_up = true;
 	}
-	OSSpinLockUnlock(&spin_lock);
+	unfair_lock_unlock(&shim_lock);
 }
 
 CFMessagePortRef rocketbootstrap_cfmessageportcreateremote(CFAllocatorRef allocator, CFStringRef name)
@@ -98,13 +100,13 @@ static bool has_hooked_messaging_center;
 
 - (void)runServerOnCurrentThreadProtectedByEntitlement:(id)entitlement
 {
+	%orig();
 	if (objc_getAssociatedObject(self, &has_hooked_messaging_center)) {
 		NSString **_centerName = CHIvarRef(self, _centerName, NSString *);
 		if (_centerName && *_centerName) {
 			rocketbootstrap_unlock([*_centerName UTF8String]);
 		}
 	}
-	%orig();
 }
 
 %end
@@ -115,11 +117,116 @@ void rocketbootstrap_distributedmessagingcenter_apply(CPDistributedMessagingCent
 {
 	if (rocketbootstrap_is_passthrough())
 		return;
-	OSSpinLockLock(&spin_lock);
+	unfair_lock_lock(&shim_lock);
 	if (!has_hooked_messaging_center) {
 		has_hooked_messaging_center = true;
 		%init(messaging_center);
 	}
-	OSSpinLockUnlock(&spin_lock);
+	unfair_lock_unlock(&shim_lock);
 	objc_setAssociatedObject(messaging_center, &has_hooked_messaging_center, (id)kCFBooleanTrue, OBJC_ASSOCIATION_ASSIGN);
 }
+
+#ifdef __clang__
+
+#ifndef __IPHONE_9_0
+#define __IPHONE_9_0 90000
+#define __AVAILABILITY_INTERNAL__IPHONE_9_0
+#endif
+
+#include <xpc/xpc.h>
+
+static xpc_endpoint_t _xpc_endpoint_create(mach_port_t port)
+{
+	static xpc_endpoint_t(*__xpc_endpoint_create)(mach_port_t);
+	if (!__xpc_endpoint_create) {
+		MSImageRef libxpc = MSGetImageByName("/usr/lib/system/libxpc.dylib");
+		if (!libxpc) {
+			return NULL;
+		}
+		__xpc_endpoint_create = MSFindSymbol(libxpc, "__xpc_endpoint_create");
+		if (!__xpc_endpoint_create) {
+			return NULL;
+		}
+	}
+	return __xpc_endpoint_create(port);
+}
+
+static mach_port_t _xpc_connection_copy_listener_port(xpc_connection_t connection)
+{
+	static mach_port_t(*__xpc_connection_copy_listener_port)(xpc_connection_t);
+	if (!__xpc_connection_copy_listener_port) {
+		MSImageRef libxpc = MSGetImageByName("/usr/lib/system/libxpc.dylib");
+		if (!libxpc) {
+			return MACH_PORT_NULL;
+		}
+		__xpc_connection_copy_listener_port = MSFindSymbol(libxpc, "__xpc_connection_copy_listener_port");
+		if (!__xpc_connection_copy_listener_port) {
+			return MACH_PORT_NULL;
+		}
+	}
+	return __xpc_connection_copy_listener_port(connection);
+}
+
+xpc_object_t xpc_connection_copy_entitlement_value(xpc_connection_t, const char* entitlement);
+
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+xpc_connection_t rocketbootstrap_xpc_connection_create(const char *name, dispatch_queue_t targetq, uint64_t flags)
+{
+	mach_port_t bootstrap = MACH_PORT_NULL;
+	if (task_get_bootstrap_port(mach_task_self(), &bootstrap) != 0) {
+		return NULL;
+	}
+	if (flags & XPC_CONNECTION_MACH_SERVICE_LISTENER) {
+		xpc_connection_t result = xpc_connection_create(NULL, targetq);
+		mach_port_t port = _xpc_connection_copy_listener_port(result);
+		if (rocketbootstrap_register(bootstrap, (char *)name, port) != 0) {
+			xpc_release(result);
+			return NULL;
+		}
+		return result;
+	}
+	mach_port_t send_port = MACH_PORT_NULL;
+	if (rocketbootstrap_look_up(bootstrap, name, &send_port) != 0) {
+		return NULL;
+	}
+	xpc_endpoint_t endpoint = _xpc_endpoint_create(send_port);
+	xpc_connection_t result = xpc_connection_create_from_endpoint(endpoint);
+	xpc_release(endpoint);
+	if (targetq != NULL) {
+		xpc_connection_set_target_queue(result, targetq);
+	}
+	return result;
+}
+
+xpc_object_t rocketbootstrap_xpc_connection_copy_application_identifier(xpc_connection_t connection)
+{
+	xpc_object_t application_id = xpc_connection_copy_entitlement_value(connection, "application-identifier");
+	if (!application_id) {
+		return NULL;
+	}
+	if (xpc_get_type(application_id) != XPC_TYPE_STRING) {
+		xpc_release(application_id);
+		return NULL;
+	}
+	xpc_object_t team_id = xpc_connection_copy_entitlement_value(connection, "com.apple.developer.team-identifier");
+	if (!team_id) {
+		return application_id;
+	}
+	if (xpc_get_type(team_id) != XPC_TYPE_STRING) {
+		xpc_release(team_id);
+		return application_id;
+	}
+	const char *application_id_str = xpc_string_get_string_ptr(application_id);
+	const char *team_id_str = xpc_string_get_string_ptr(team_id);
+	size_t team_id_length = xpc_string_get_length(team_id);
+	if (memcmp(application_id_str, team_id_str, team_id_length) != 0 || application_id_str[team_id_length] != '.') {
+		xpc_release(team_id);
+		return application_id;
+	}
+	xpc_object_t trimmed_id = xpc_string_create(application_id_str + team_id_length + 1);
+	xpc_release(team_id);
+	xpc_release(application_id);
+	return trimmed_id;
+}
+
+#endif