add procursus(alt) repo and hide more jailbreak traces

Author: roothider

Application/Dopamine/Jailbreak/DOBootstrapper.m

@@ -886,6 +886,11 @@ uint64_t jbrand_current()
 URIs: https://roothide.github.io/procursus\n\
 Suites: iphoneos-arm64e/%d\n\
 Components: main\n\
+\n\
+Types: deb\n\
+URIs: https://github.com/roothide/roothide.github.io/releases/download/%d/\n\
+Suites: ./\n\
+Components:\n\
 "
 
 // #define ALT_SOURCES "\
@@ -908,6 +913,7 @@ uint64_t jbrand_current()
 deb https://havoc.app/ ./\n\
 deb https://roothide.github.io/ ./\n\
 deb https://roothide.github.io/procursus iphoneos-arm64e/%d main\n\
+deb https://github.com/roothide/roothide.github.io/releases/download/%d/ ./\n\
 \n\
 "
 
@@ -935,7 +941,7 @@ -(int) buildPackageSources:(void (^)(NSError *))completion
 {
     NSFileManager* fm = NSFileManager.defaultManager;
 
-    ASSERT([[NSString stringWithFormat:@(DEFAULT_SOURCES), getCFMajorVersion()] writeToFile:jbrootPrefix(@"/etc/apt/sources.list.d/default.sources") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
+    ASSERT([[NSString stringWithFormat:@(DEFAULT_SOURCES), getCFMajorVersion(), getCFMajorVersion()] writeToFile:jbrootPrefix(@"/etc/apt/sources.list.d/default.sources") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
 
     // //Users in some regions seem to be unable to access github.io
     // if([NSLocale.currentLocale.countryCode isEqualToString:@"CN"]) {
@@ -948,7 +954,7 @@ -(int) buildPackageSources:(void (^)(NSError *))completion
         ASSERT([fm createDirectoryAtPath:jbrootPrefix(@"/var/mobile/Library/Application Support/xyz.willy.Zebra") withIntermediateDirectories:YES attributes:attr error:nil]);
     }
 
-    ASSERT([[NSString stringWithFormat:@(ZEBRA_SOURCES), getCFMajorVersion()] writeToFile:jbrootPrefix(@"/var/mobile/Library/Application Support/xyz.willy.Zebra/sources.list") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
+    ASSERT([[NSString stringWithFormat:@(ZEBRA_SOURCES), getCFMajorVersion(), getCFMajorVersion()] writeToFile:jbrootPrefix(@"/var/mobile/Library/Application Support/xyz.willy.Zebra/sources.list") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
 
     return 0;
 }

BaseBin/roothidehooks/Makefile

@@ -13,8 +13,6 @@ roothidehooks_CFLAGS = -Werror -fobjc-arc -I../.include
 roothidehooks_LDFLAGS = -rpath @loader_path/.jbroot/Library/Frameworks -rpath @loader_path/fallback -L../libjailbreak -ljailbreak
 roothidehooks_INSTALL_PATH = /basebin
 
-lsd.x_CFLAGS = -fno-objc-arc #lsd using mrc
-
 include $(THEOS_MAKE_PATH)/tweak.mk
 
 after-roothidehooks-all::

BaseBin/roothidehooks/lsd.x

@@ -1,6 +1,8 @@
-#import <Foundation/Foundation.h>
-#import <spawn.h>
+#include <Foundation/Foundation.h>
+
+#include <spawn.h>
 #include <roothide.h>
+
 #include "common.h"
 
 extern char **environ;
@@ -78,7 +80,7 @@ static const void *kBlockSchemeTagKey = &kBlockSchemeTagKey;
 	return result;
 }
 
-- (BOOL)canOpenURL:(NSURL*)url publicSchemes:(BOOL)ispublic privateSchemes:(BOOL)isprivate XPCConnection:(NSXPCConnection*)connection error:(NSError*)err
+- (BOOL)canOpenURL:(NSURL*)url publicSchemes:(BOOL)ispublic privateSchemes:(BOOL)isprivate XPCConnection:(NSXPCConnection*)connection error:(NSError**)perror
 {
 	BOOL blocked = NO;
 
@@ -109,7 +111,7 @@ static const void *kBlockSchemeTagKey = &kBlockSchemeTagKey;
 	return ret;
 }
 
-%end
+%end //%hook _LSCanOpenURLManager
 
 
 @interface _LSDOpenClient : NSObject
@@ -229,12 +231,265 @@ static const void *kBlockSchemeTagKey = &kBlockSchemeTagKey;
 	%orig(url, options, newcallback);
 }
 
-%end
+%end //%hook _LSDOpenClient
+
+%group UTTypeHooks
+
+@interface UTTypeRecord : NSObject
++ (id)typeRecordWithIdentifier:(id)identifier;
+- (unsigned int)tableID;
+@end
+
+@interface _UTDeclaredTypeRecord : NSObject
+- (id)_initWithContext:(void*)ctx tableID:(unsigned int)tableID unitID:(unsigned int)unitID;
+- (BOOL)isDeclared;
+- (BOOL)isCoreType;
+- (BOOL)isInPublicDomain;
+- (id)identifier;
+- (id)declaringBundleRecord;
+- (unsigned int)unitID;
+- (unsigned int)_rawFlags;
+@end
+
+@interface LSBundleRecord : NSObject
+- (NSURL*)URL;
+@end
+
+@interface _LSDReadClient : NSObject
+- (NSXPCConnection*)XPCConnection;
+@end
+
+static __thread BOOL g_utrHide = NO;   // raised by the _LSDReadClient hooks for blacklisted requests
+static __thread int  g_utrBusy = 0;    // >0 while we ourselves touch the DB, to keep our access out of the filters
+
+static BOOL utrFilterActive(void) { return g_utrHide && !g_utrBusy; }
+
+static pid_t utrClientPid(_LSDReadClient* client)
+{
+	NSXPCConnection* conn = [client XPCConnection];
+	return conn ? conn.processIdentifier : -1;
+}
+
+static BOOL utrHideClientBlacklisted(_LSDReadClient* client)
+{
+	pid_t pid = utrClientPid(client);
+	if(pid>0 && jbclient_blacklist_check_pid(pid)) {
+		return YES;
+	}
+	return NO;
+}
+
+// type-units table id; constant for the database. Read once, off the hot path, via a public accessor.
+static unsigned int utrTypeTableID(void)
+{
+	static unsigned int tid = 0;
+	static dispatch_once_t once;
+	dispatch_once(&once, ^{
+		// guard this probe's own nested lookup so it is never filtered, independent of the caller.
+		// g_utrBusy is a counter, so this nests cleanly inside utrUnitIsJailbreak's busy region.
+		g_utrBusy++;
+		tid = (unsigned int)[[NSClassFromString(@"UTTypeRecord") typeRecordWithIdentifier:@"public.data"] tableID];
+		g_utrBusy--;
+	});
+	return tid;
+}
+
+// YES only when `rec` is a *declared* type whose active declaring bundle is a jailbreak bundle,
+// and which is not an Apple core / public-domain type (those are never touched -> #3).
+static BOOL utrRecordIsFromJailbreakApp(_UTDeclaredTypeRecord* rec)
+{
+	if (![rec isDeclared]) return NO;                // dynamic/undeclared -> already the "absent" shape
+	if ([rec isCoreType]) return NO;                 // Apple core type -> never touched (#3)
+	if ([rec isInPublicDomain]) return NO;           // public.* -> never touched (#3)
+	LSBundleRecord* bundleRec = [rec declaringBundleRecord];
+	NSURL* url = [bundleRec URL];
+	if (![url isKindOfClass:[NSURL class]] || !url.isFileURL) return NO;
+	if (!isJailbreakBundlePath(url.path.fileSystemRepresentation)) return NO;
+
+	NSLog(@"[UTType] hide type id=%@ bundle=%@", [rec identifier], url);
+	return YES;
+}
+
+// build a record for an enumerated unitID and decide if it belongs to a jailbreak app.
+static BOOL utrUnitIsJailbreak(void* db, intptr_t unitID)
+{
+	BOOL result = NO;
+	g_utrBusy++; // keep our own nested DB access out of the filters
+	unsigned int tid = utrTypeTableID();
+	if (tid) {
+		void* ctx = db; // _initWithContext: reads *(void**)ctx (offset 0) == db
+		_UTDeclaredTypeRecord* rec = [[NSClassFromString(@"_UTDeclaredTypeRecord") alloc]
+					_initWithContext:(void*)&ctx tableID:tid unitID:(unsigned int)unitID];
+		result = utrRecordIsFromJailbreakApp(rec);
+	}
+	g_utrBusy--;
+	return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+typedef intptr_t (^UTREnumBlock)(intptr_t a2, intptr_t unitID, const void* unitBytes, void* a5);
+%hookf(void, _UTEnumerateTypesForTag, void* db, void* tagClass, void* tag, id block)
+{
+	if (!utrFilterActive() || !block) { %orig; return; }
+
+	UTREnumBlock orig = (UTREnumBlock)block;
+	UTREnumBlock wrapper = ^intptr_t(intptr_t a2, intptr_t unitID, const void* unitBytes, void* a5) {
+		if (utrUnitIsJailbreak(db, unitID)) return 0;        // drop -> continue enumeration, nothing recorded
+		return orig(a2, unitID, unitBytes, a5);              // forward to the original callback
+	};
+	%orig(db, tagClass, tag, wrapper);
+}
+
+%hookf(void, _UTEnumerateTypesForIdentifier, void* db, long identStrId, id block)
+{
+	if (!utrFilterActive() || !block) { %orig; return; }
+
+	UTREnumBlock orig = (UTREnumBlock)block;
+	UTREnumBlock wrapper = ^intptr_t(intptr_t a2, intptr_t unitID, const void* unitBytes, void* a5) {
+		if (utrUnitIsJailbreak(db, unitID)) return 0;
+		return orig(a2, unitID, unitBytes, a5);
+	};
+	%orig(db, identStrId, wrapper);
+}
+
+typedef void (^UTRConformBlock)(intptr_t unitID, const void* unitBytes, intptr_t kind, unsigned char* outStop);
+%hookf(void, _UTTypeSearchConformingTypesWithBlock, void* db, long unitID, long flags, long arg4, id block)
+{
+	if (!utrFilterActive() || !block) { %orig; return; }
+
+	UTRConformBlock orig = (UTRConformBlock)block;
+	UTRConformBlock wrapper = ^void(intptr_t uid, const void* unitBytes, intptr_t kind, unsigned char* outStop) {
+		if (utrUnitIsJailbreak(db, uid)) return;             // drop conforming JB type -> outStop stays 0, keep enumerating
+		orig(uid, unitBytes, kind, outStop);                 // forward to the original callback
+	};
+	%orig(db, unitID, flags, arg4, wrapper);
+}
+
+// parents/forward conformance: filters JB parent types out of related-types (degree>0)
+// and out of a record's serialized parentTypeIdentifiers/conformsTo list.
+// _UTTypeConformsTo's boolean verdict goes through ...Common (not WithBlock), so it is unaffected.
+%hookf(void, _UTTypeSearchConformsToTypesWithBlock, void* db, long unitID, long flags, long arg4, id block)
+{
+	if (!utrFilterActive() || !block) { %orig; return; }
+
+	UTRConformBlock orig = (UTRConformBlock)block;
+	UTRConformBlock wrapper = ^void(intptr_t uid, const void* unitBytes, intptr_t kind, unsigned char* outStop) {
+		if (utrUnitIsJailbreak(db, uid)) return;             // drop conforming-to (parent) JB type -> keep enumerating
+		orig(uid, unitBytes, kind, outStop);                 // forward to the original callback
+	};
+	%orig(db, unitID, flags, arg4, wrapper);
+}
 
 
+%hookf(void, _LSSchemaCacheRead, void* a1, id block)
+{
+	if (utrFilterActive()) return; // force cache miss -> recompute (filtered)
+	%orig(a1, block);
+}
+
+%hookf(void, _LSSchemaCacheWrite, void* a1, id block)
+{
+	if (utrFilterActive()) return; // don't cache the hidden result
+	%orig(a1, block);
+}
+
+%hook _LSDReadClient
+- (void)getTypeRecordWithTag:(id)tag ofClass:(id)_class conformingToIdentifier:(id)identifier completionHandler:(void(^)(id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getTypeRecordWithTag:%@ ofClass:%@ conforming:%@ pid=%d", tag, _class, identifier, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getTypeRecordsWithTag:(id)tag ofClass:(id)_class conformingToIdentifier:(id)identifier completionHandler:(void(^)(id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getTypeRecordsWithTag:%@ ofClass:%@ conforming:%@ pid=%d", tag, _class, identifier, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getTypeRecordWithIdentifier:(id)identifier allowUndeclared:(BOOL)allowUndeclared completionHandler:(void(^)(id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getTypeRecordWithIdentifier:%@ allowUndeclared:%d pid=%d", identifier, allowUndeclared, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getTypeRecordsWithIdentifiers:(id)identifiers completionHandler:(void(^)(id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getTypeRecordsWithIdentifiers:%@ pid=%d", identifiers, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getTypeRecordForImportedTypeWithIdentifier:(id)identifier conformingToIdentifier:(id)conforming completionHandler:(void(^)(id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getTypeRecordForImportedTypeWithIdentifier:%@ conforming:%@ pid=%d", identifier, conforming, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getRelatedTypesOfTypeWithIdentifier:(id)identifier maximumDegreeOfSeparation:(NSInteger)degree completionHandler:(void(^)(id, id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getRelatedTypesOfTypeWithIdentifier:%@ degree:%ld pid=%d", identifier, (long)degree, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getWhetherTypeIdentifier:(id)identifier conformsToTypeIdentifier:(id)other completionHandler:(void(^)(id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getWhetherTypeIdentifier:%@ conformsToTypeIdentifier:%@ pid=%d", identifier, other, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getResourceValuesForKeys:(id)keys URL:(id)url preferredLocalizations:(id)locs completionHandler:(void(^)(id, id, id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getResourceValuesForKeys:%@ URL:%@ pid=%d", keys, url, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+
+- (void)getBoundIconInfoForDocumentProxy:(id)documentProxy completionHandler:(void(^)(id, id))handler
+{
+	if (!utrHideClientBlacklisted(self)) { %orig; return; }
+	NSLog(@"[UTType] getBoundIconInfoForDocumentProxy:%@ pid=%d", documentProxy, utrClientPid(self));
+	g_utrHide = YES;
+	%orig;
+	g_utrHide = NO;
+}
+%end //%hook _LSDReadClient
+
+%end // %group UTTypeHooks
+
 %hook _LSQueryContext
 
--(NSMutableDictionary*)_resolveQueries:(NSMutableSet*)queries XPCConnection:(NSXPCConnection*)connection error:(NSError*)err 
+@interface LSPlugInQueryWithUnits : NSObject
+-(id)initWithPlugInUnits:(id)units forDatabaseWithUUID:(id)dbUUID;
+@end
+
+@interface _LSQueryContext : NSObject
+-(NSMutableDictionary*)_resolveQueries:(NSMutableSet*)queries XPCConnection:(NSXPCConnection*)connection error:(NSError**)perror;
+@end
+
+-(NSMutableDictionary*)_resolveQueries:(NSMutableSet*)queries XPCConnection:(NSXPCConnection*)connection error:(NSError**)perror 
 {
 	NSMutableDictionary* result = %orig;
 	/*
@@ -317,7 +572,7 @@ static const void *kBlockSchemeTagKey = &kBlockSchemeTagKey;
 				NSArray* _pluginUnits = [unitsResult valueForKey:@"_pluginUnits"];
 				NSLog(@"LSPlugInQueryAllUnits: _dbUUID=%@, _pluginUnits count=%ld", _dbUUID, _pluginUnits.count);
 				id unitQuery = [[NSClassFromString(@"LSPlugInQueryWithUnits") alloc] initWithPlugInUnits:_pluginUnits forDatabaseWithUUID:_dbUUID];
-				NSMutableDictionary* queriesResult = [self _resolveQueries:[NSSet setWithObject:unitQuery] XPCConnection:connection error:err];
+				NSMutableDictionary* queriesResult = [self _resolveQueries:[NSSet setWithObject:unitQuery].mutableCopy XPCConnection:connection error:perror];
 				if(queriesResult)
 				{
 					for(id queryKey in queriesResult)
@@ -334,7 +589,7 @@ static const void *kBlockSchemeTagKey = &kBlockSchemeTagKey;
 	return result;
 }
 
-%end
+%end //%hook _LSQueryContext
 
 
 //or -[Copier initWithSourceURL:uniqueIdentifier:destURL:callbackTarget:selector:options:] in transitd
@@ -397,5 +652,17 @@ void lsdInit(void)
 		MSHookFunction(_LSServer_RebuildApplicationDatabases, (void *)&new_LSServer_RebuildApplicationDatabases, (void **)&orig_LSServer_RebuildApplicationDatabases);
 	}
 
+	void* _LSSchemaCacheRead = MSFindSymbol(coreServicesImage, "__LSSchemaCacheRead");
+	void* _LSSchemaCacheWrite = MSFindSymbol(coreServicesImage, "__LSSchemaCacheWrite");
+	void* _UTEnumerateTypesForTag = MSFindSymbol(coreServicesImage, "__UTEnumerateTypesForTag");
+	void* _UTEnumerateTypesForIdentifier = MSFindSymbol(coreServicesImage, "__UTEnumerateTypesForIdentifier");
+	void* _UTTypeSearchConformingTypesWithBlock = MSFindSymbol(coreServicesImage, "__UTTypeSearchConformingTypesWithBlock");
+	void* _UTTypeSearchConformsToTypesWithBlock = MSFindSymbol(coreServicesImage, "__UTTypeSearchConformsToTypesWithBlock");
+	if(_LSSchemaCacheRead && _LSSchemaCacheWrite && _UTEnumerateTypesForTag && _UTEnumerateTypesForIdentifier && _UTTypeSearchConformingTypesWithBlock && _UTTypeSearchConformsToTypesWithBlock)
+	{
+		NSLog(@"UTTypeHooks: installing");
+		%init(UTTypeHooks, _LSSchemaCacheRead=_LSSchemaCacheRead, _LSSchemaCacheWrite=_LSSchemaCacheWrite, _UTEnumerateTypesForTag=_UTEnumerateTypesForTag, _UTEnumerateTypesForIdentifier=_UTEnumerateTypesForIdentifier, _UTTypeSearchConformingTypesWithBlock=_UTTypeSearchConformingTypesWithBlock, _UTTypeSearchConformsToTypesWithBlock=_UTTypeSearchConformsToTypesWithBlock);
+	}
+
 	%init();
 }