More changes

Author: Matthew Benedict

Source/CyberCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

@@ -117,11 +117,11 @@ WTF_EXTERN_C_END
 #import <CoreServices/LSDatabaseContext+CyberKit.h>
 #elif !USE(APPLE_INTERNAL_SDK)
 @interface LSDatabaseContext (CyberKitChangeTracking)
-- (id <NSObject>)addDatabaseChangeObserver4CyberKit:(void (^)(xpc_object_t change))observer;
-- (void)removeDatabaseChangeObserver4CyberKit:(id <NSObject>)token;
-- (void)observeDatabaseChange4CyberKit:(xpc_object_t)change;
+- (id <NSObject>)addDatabaseChangeObserver4WebKit:(void (^)(xpc_object_t change))observer;
+- (void)removeDatabaseChangeObserver4WebKit:(id <NSObject>)token;
+- (void)observeDatabaseChange4WebKit:(xpc_object_t)change;
 
-- (void)getSystemContentDatabaseObject4CyberKit:(void (^)(xpc_object_t object, NSError *error))completion;
+- (void)getSystemContentDatabaseObject4WebKit:(void (^)(xpc_object_t object, NSError *error))completion;
 @end
 #endif
 #endif

Source/CyberKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm

@@ -37,7 +37,9 @@
 LaunchServicesDatabaseObserver::LaunchServicesDatabaseObserver(NetworkProcess&)
 {
 #if HAVE(LSDATABASECONTEXT) && !HAVE(SYSTEM_CONTENT_LS_DATABASE)
-    m_observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4CyberKit:^(xpc_object_t change) {
+    if (![LSDatabaseContext.sharedDatabaseContext respondsToSelector:@selector(addDatabaseChangeObserver4WebKit:)])
+            return;
+    m_observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
         xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
         xpc_dictionary_set_value(message.get(), LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseKey, change);
@@ -75,15 +77,22 @@
 
     }).get()];
 #elif HAVE(LSDATABASECONTEXT)
-    RetainPtr<id> observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4CyberKit:^(xpc_object_t change) {
+    if (![LSDatabaseContext.sharedDatabaseContext respondsToSelector:@selector(addDatabaseChangeObserver4WebKit:)]) {
+            auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
+            xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
+            xpc_connection_send_message(connection.get(), message.get());
+            return;
+        }
+    
+    RetainPtr<id> observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
         xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
         xpc_dictionary_set_value(message.get(), LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseKey, change);
 
         xpc_connection_send_message(connection.get(), message.get());
     }];
 
-    [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4CyberKit:observer.get()];
+    [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:observer.get()];
 #else
     auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
     xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
@@ -94,7 +103,7 @@
 LaunchServicesDatabaseObserver::~LaunchServicesDatabaseObserver()
 {
 #if HAVE(LSDATABASECONTEXT) && !HAVE(SYSTEM_CONTENT_LS_DATABASE)
-    [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4CyberKit:m_observer.get()];
+    [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:m_observer.get()];
 #endif
 }
 

Source/CyberKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm

@@ -52,7 +52,7 @@
         RELEASE_LOG(Loading, "Received Launch Services database %p", database);
 
         if (database)
-            [LSDatabaseContext.sharedDatabaseContext observeDatabaseChange4CyberKit:database];
+            [LSDatabaseContext.sharedDatabaseContext observeDatabaseChange4WebKit:database];
 #endif
         m_semaphore.signal();
         m_hasReceivedLaunchServicesDatabase = true;

script_fakesigner.entitlements

@@ -133,6 +133,8 @@
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
 	<key>com.apple.security.cs.jit-write-allowlist</key>
 	<true/>
 	<key>com.apple.security.cs.single-jit</key>
@@ -215,7 +217,10 @@
 	<key>com.apple.security.get-task-allow</key>
 	<true/>
 	<key>com.apple.security.iokit-user-client-class</key>
-	<string>AGXDeviceUserClient</string>
+	<array>
+		<string>AGXDeviceUserClient</string>
+		<string>IOSurfaceRootUserClient</string>
+	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.temporary-exception.sbpl</key>