Changeset 286613 in webkit

Timestamp:

Dec 7, 2021, 1:19:34 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r286273. rdar://problem/86052131

Make webpushd "fake registration for testing" much more complicated by adding a "mock app bundle" install
​https://bugs.webkit.org/show_bug.cgi?id=233454

Reviewed by Alex Christensen.

Covered by API tests.

Before this patch, webpushd remembered "registrations" using a simple in-memory HashMap.

In the near future, registrations will actually be represented with a placeholder app bundle on disk.

The process of installing placeholders (and checking for existing ones) is complicated and asynchronous.

This patch shifts the in-memory testing implementation from a simple HashMap to a "complicated and asynchronous"
registration mechanism that simulates how app-bundle installs will work.

Once the "real" mechanisms are in place there will be much more in-depth testing that we can do.
For now, this is a "no behavior change" patch.

• NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm: (WebKit::WebPushD::Connection::connectionReceivedEvent const):
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:

• WebKit.xcodeproj/project.pbxproj:

"PushAppBundle" is an abstract base class for representing a placeholder application bundle for a registration.
Eventually there will be a native one for each platform that actually does system operations.
For now, the concrete implementation is the in-memory "Mock" app bundle.

• webpushd/PushAppBundle.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
• webpushd/PushAppBundle.mm: Copied from Source/WebKit/webpushd/PushClientConnection.h. (WebPushD::PushAppBundleClient::~PushAppBundleClient): (WebPushD::PushAppBundle::PushAppBundle): (WebPushD::PushAppBundle::~PushAppBundle): (WebPushD::PushAppBundle::detachFromClient):

An "AppBundleRequest" is a queable operation meant to do something with an "App bundle".
For now the operations are "create" and "delete"

• webpushd/AppBundleRequest.h: Added. (WebPushD::AppBundleRequestImpl::AppBundleRequestImpl): (WebPushD::AppBundleRequestImpl::~AppBundleRequestImpl): (WebPushD::AppBundleRequestImpl::callCompletionHandlerAndCleanup): (WebPushD::AppBundlePermissionsRequest::AppBundlePermissionsRequest): (WebPushD::AppBundleDeletionRequest::AppBundleDeletionRequest):
• webpushd/AppBundleRequest.mm: Added. (WebPushD::AppBundleRequest::AppBundleRequest): (WebPushD::AppBundleRequest::~AppBundleRequest): (WebPushD::AppBundleRequest::start): (WebPushD::AppBundleRequest::cancel): (WebPushD::AppBundleRequest::cleanupAfterCompletionHandler): (WebPushD::AppBundlePermissionsRequest::startInternal): (WebPushD::AppBundlePermissionsRequest::didCheckForExistingBundle): (WebPushD::AppBundlePermissionsRequest::didCreateAppBundle): (WebPushD::AppBundleDeletionRequest::startInternal): (WebPushD::AppBundleDeletionRequest::didDeleteExistingBundleWithError):

• webpushd/MockAppBundleForTesting.h: Copied from Source/WebKit/webpushd/PushClientConnection.h. (WebPushD::MockAppBundleForTesting::create):
• webpushd/MockAppBundleForTesting.mm: Added. (WebPushD::MockAppBundleForTesting::MockAppBundleForTesting): (WebPushD::MockAppBundleForTesting::~MockAppBundleForTesting): (WebPushD::MockAppBundleForTesting::checkForExistingBundle): (WebPushD::MockAppBundleForTesting::deleteExistingBundle): (WebPushD::MockAppBundleForTesting::createBundle): (WebPushD::MockAppBundleForTesting::stop):

• webpushd/MockAppBundleRegistry.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
• webpushd/MockAppBundleRegistry.mm: Added. (WebPushD::MockAppBundleRegistry::singleton): (WebPushD::MockAppBundleRegistry::getOriginsWithRegistrations): (WebPushD::MockAppBundleRegistry::doesBundleExist): (WebPushD::MockAppBundleRegistry::createBundle): (WebPushD::MockAppBundleRegistry::deleteBundle):

• webpushd/PushClientConnection.h:
• webpushd/PushClientConnection.mm: (WebPushD::ClientConnection::create): (WebPushD::ClientConnection::enqueueAppBundleRequest): (WebPushD::ClientConnection::maybeStartNextAppBundleRequest): (WebPushD::ClientConnection::didCompleteAppBundleRequest): (WebPushD::ClientConnection::connectionClosed):

• webpushd/WebPushDaemon.h:
• webpushd/WebPushDaemon.mm: (WebPushD::Daemon::connectionAdded): (WebPushD::Daemon::connectionRemoved): (WebPushD::Daemon::requestSystemNotificationPermission): (WebPushD::Daemon::getOriginsWithPushAndNotificationPermissions): (WebPushD::Daemon::deletePushAndNotificationRegistration):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@286273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613.1.10-branch

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• Source/WebKit/WebKit.xcodeproj/project.pbxproj (modified) (7 diffs)
• Source/WebKit/webpushd/AppBundleRequest.h (added)
• Source/WebKit/webpushd/AppBundleRequest.mm (added)
• Source/WebKit/webpushd/MockAppBundleForTesting.h (copied) (copied from branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushClientConnection.h ) (1 diff)
• Source/WebKit/webpushd/MockAppBundleForTesting.mm (added)
• Source/WebKit/webpushd/MockAppBundleRegistry.h (copied) (copied from branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushClientConnection.h ) (1 diff)
• Source/WebKit/webpushd/MockAppBundleRegistry.mm (added)
• Source/WebKit/webpushd/PushAppBundle.h (copied) (copied from branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushClientConnection.h ) (1 diff)
• Source/WebKit/webpushd/PushAppBundle.mm (copied) (copied from branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushClientConnection.h ) (1 diff)
• Source/WebKit/webpushd/PushClientConnection.h (modified) (4 diffs)
• Source/WebKit/webpushd/PushClientConnection.mm (modified) (3 diffs)
• Source/WebKit/webpushd/WebPushDaemon.h (modified) (1 diff)
• Source/WebKit/webpushd/WebPushDaemon.mm (modified) (6 diffs)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm (modified) (2 diffs)

branches/safari-613.1.10-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-06  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r286273. rdar://problem/86052131
+
+    Make webpushd "fake registration for testing" much more complicated by adding a "mock app bundle" install
+    https://bugs.webkit.org/show_bug.cgi?id=233454
+    
+    Reviewed by Alex Christensen.
+    
+    Covered by API tests.
+    
+    Before this patch, webpushd remembered "registrations" using a simple in-memory HashMap.
+    
+    In the near future, registrations will actually be represented with a placeholder app bundle on disk.
+    
+    The process of installing placeholders (and checking for existing ones) is complicated and asynchronous.
+    
+    This patch shifts the in-memory testing implementation from a simple HashMap to a "complicated and asynchronous"
+    registration mechanism that simulates how app-bundle installs will work.
+    
+    Once the "real" mechanisms are in place there will be much more in-depth testing that we can do.
+    For now, this is a "no behavior change" patch.
+    
+    * NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm:
+    (WebKit::WebPushD::Connection::connectionReceivedEvent const):
+    * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+    
+    * WebKit.xcodeproj/project.pbxproj:
+    
+    "PushAppBundle" is an abstract base class for representing a placeholder application bundle for a registration.
+    Eventually there will be a native one for each platform that actually does system operations.
+    For now, the concrete implementation is the in-memory "Mock" app bundle.
+    
+    * webpushd/PushAppBundle.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+    * webpushd/PushAppBundle.mm: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+    (WebPushD::PushAppBundleClient::~PushAppBundleClient):
+    (WebPushD::PushAppBundle::PushAppBundle):
+    (WebPushD::PushAppBundle::~PushAppBundle):
+    (WebPushD::PushAppBundle::detachFromClient):
+    
+    An "AppBundleRequest" is a queable operation meant to do something with an "App bundle".
+    For now the operations are "create" and "delete"
+    
+    * webpushd/AppBundleRequest.h: Added.
+    (WebPushD::AppBundleRequestImpl::AppBundleRequestImpl):
+    (WebPushD::AppBundleRequestImpl::~AppBundleRequestImpl):
+    (WebPushD::AppBundleRequestImpl::callCompletionHandlerAndCleanup):
+    (WebPushD::AppBundlePermissionsRequest::AppBundlePermissionsRequest):
+    (WebPushD::AppBundleDeletionRequest::AppBundleDeletionRequest):
+    * webpushd/AppBundleRequest.mm: Added.
+    (WebPushD::AppBundleRequest::AppBundleRequest):
+    (WebPushD::AppBundleRequest::~AppBundleRequest):
+    (WebPushD::AppBundleRequest::start):
+    (WebPushD::AppBundleRequest::cancel):
+    (WebPushD::AppBundleRequest::cleanupAfterCompletionHandler):
+    (WebPushD::AppBundlePermissionsRequest::startInternal):
+    (WebPushD::AppBundlePermissionsRequest::didCheckForExistingBundle):
+    (WebPushD::AppBundlePermissionsRequest::didCreateAppBundle):
+    (WebPushD::AppBundleDeletionRequest::startInternal):
+    (WebPushD::AppBundleDeletionRequest::didDeleteExistingBundleWithError):
+    
+    * webpushd/MockAppBundleForTesting.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+    (WebPushD::MockAppBundleForTesting::create):
+    * webpushd/MockAppBundleForTesting.mm: Added.
+    (WebPushD::MockAppBundleForTesting::MockAppBundleForTesting):
+    (WebPushD::MockAppBundleForTesting::~MockAppBundleForTesting):
+    (WebPushD::MockAppBundleForTesting::checkForExistingBundle):
+    (WebPushD::MockAppBundleForTesting::deleteExistingBundle):
+    (WebPushD::MockAppBundleForTesting::createBundle):
+    (WebPushD::MockAppBundleForTesting::stop):
+    
+    * webpushd/MockAppBundleRegistry.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+    * webpushd/MockAppBundleRegistry.mm: Added.
+    (WebPushD::MockAppBundleRegistry::singleton):
+    (WebPushD::MockAppBundleRegistry::getOriginsWithRegistrations):
+    (WebPushD::MockAppBundleRegistry::doesBundleExist):
+    (WebPushD::MockAppBundleRegistry::createBundle):
+    (WebPushD::MockAppBundleRegistry::deleteBundle):
+    
+    * webpushd/PushClientConnection.h:
+    * webpushd/PushClientConnection.mm:
+    (WebPushD::ClientConnection::create):
+    (WebPushD::ClientConnection::enqueueAppBundleRequest):
+    (WebPushD::ClientConnection::maybeStartNextAppBundleRequest):
+    (WebPushD::ClientConnection::didCompleteAppBundleRequest):
+    (WebPushD::ClientConnection::connectionClosed):
+    
+    * webpushd/WebPushDaemon.h:
+    * webpushd/WebPushDaemon.mm:
+    (WebPushD::Daemon::connectionAdded):
+    (WebPushD::Daemon::connectionRemoved):
+    (WebPushD::Daemon::requestSystemNotificationPermission):
+    (WebPushD::Daemon::getOriginsWithPushAndNotificationPermissions):
+    (WebPushD::Daemon::deletePushAndNotificationRegistration):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-29  Brady Eidson  <beidson@apple.com>
+
+            Make webpushd "fake registration for testing" much more complicated by adding a "mock app bundle" install
+            https://bugs.webkit.org/show_bug.cgi?id=233454
+
+            Reviewed by Alex Christensen.
+
+            Covered by API tests.
+
+            Before this patch, webpushd remembered "registrations" using a simple in-memory HashMap.
+
+            In the near future, registrations will actually be represented with a placeholder app bundle on disk.
+
+            The process of installing placeholders (and checking for existing ones) is complicated and asynchronous.
+
+            This patch shifts the in-memory testing implementation from a simple HashMap to a "complicated and asynchronous"
+            registration mechanism that simulates how app-bundle installs will work.
+
+            Once the "real" mechanisms are in place there will be much more in-depth testing that we can do.
+            For now, this is a "no behavior change" patch.
+
+            * NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm:
+            (WebKit::WebPushD::Connection::connectionReceivedEvent const):
+            * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+            * WebKit.xcodeproj/project.pbxproj:
+
+            "PushAppBundle" is an abstract base class for representing a placeholder application bundle for a registration.
+            Eventually there will be a native one for each platform that actually does system operations.
+            For now, the concrete implementation is the in-memory "Mock" app bundle.
+
+            * webpushd/PushAppBundle.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+            * webpushd/PushAppBundle.mm: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+            (WebPushD::PushAppBundleClient::~PushAppBundleClient):
+            (WebPushD::PushAppBundle::PushAppBundle):
+            (WebPushD::PushAppBundle::~PushAppBundle):
+            (WebPushD::PushAppBundle::detachFromClient):
+
+            An "AppBundleRequest" is a queable operation meant to do something with an "App bundle".
+            For now the operations are "create" and "delete"
+
+            * webpushd/AppBundleRequest.h: Added.
+            (WebPushD::AppBundleRequestImpl::AppBundleRequestImpl):
+            (WebPushD::AppBundleRequestImpl::~AppBundleRequestImpl):
+            (WebPushD::AppBundleRequestImpl::callCompletionHandlerAndCleanup):
+            (WebPushD::AppBundlePermissionsRequest::AppBundlePermissionsRequest):
+            (WebPushD::AppBundleDeletionRequest::AppBundleDeletionRequest):
+            * webpushd/AppBundleRequest.mm: Added.
+            (WebPushD::AppBundleRequest::AppBundleRequest):
+            (WebPushD::AppBundleRequest::~AppBundleRequest):
+            (WebPushD::AppBundleRequest::start):
+            (WebPushD::AppBundleRequest::cancel):
+            (WebPushD::AppBundleRequest::cleanupAfterCompletionHandler):
+            (WebPushD::AppBundlePermissionsRequest::startInternal):
+            (WebPushD::AppBundlePermissionsRequest::didCheckForExistingBundle):
+            (WebPushD::AppBundlePermissionsRequest::didCreateAppBundle):
+            (WebPushD::AppBundleDeletionRequest::startInternal):
+            (WebPushD::AppBundleDeletionRequest::didDeleteExistingBundleWithError):
+
+            * webpushd/MockAppBundleForTesting.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+            (WebPushD::MockAppBundleForTesting::create):
+            * webpushd/MockAppBundleForTesting.mm: Added.
+            (WebPushD::MockAppBundleForTesting::MockAppBundleForTesting):
+            (WebPushD::MockAppBundleForTesting::~MockAppBundleForTesting):
+            (WebPushD::MockAppBundleForTesting::checkForExistingBundle):
+            (WebPushD::MockAppBundleForTesting::deleteExistingBundle):
+            (WebPushD::MockAppBundleForTesting::createBundle):
+            (WebPushD::MockAppBundleForTesting::stop):
+
+            * webpushd/MockAppBundleRegistry.h: Copied from Source/WebKit/webpushd/PushClientConnection.h.
+            * webpushd/MockAppBundleRegistry.mm: Added.
+            (WebPushD::MockAppBundleRegistry::singleton):
+            (WebPushD::MockAppBundleRegistry::getOriginsWithRegistrations):
+            (WebPushD::MockAppBundleRegistry::doesBundleExist):
+            (WebPushD::MockAppBundleRegistry::createBundle):
+            (WebPushD::MockAppBundleRegistry::deleteBundle):
+
+            * webpushd/PushClientConnection.h:
+            * webpushd/PushClientConnection.mm:
+            (WebPushD::ClientConnection::create):
+            (WebPushD::ClientConnection::enqueueAppBundleRequest):
+            (WebPushD::ClientConnection::maybeStartNextAppBundleRequest):
+            (WebPushD::ClientConnection::didCompleteAppBundleRequest):
+            (WebPushD::ClientConnection::connectionClosed):
+
+            * webpushd/WebPushDaemon.h:
+            * webpushd/WebPushDaemon.mm:
+            (WebPushD::Daemon::connectionAdded):
+            (WebPushD::Daemon::connectionRemoved):
+            (WebPushD::Daemon::requestSystemNotificationPermission):
+            (WebPushD::Daemon::getOriginsWithPushAndNotificationPermissions):
+            (WebPushD::Daemon::deletePushAndNotificationRegistration):
+
 2021-12-02  Russell Epstein  <repstein@apple.com>
 

branches/safari-613.1.10-branch/Source/WebKit/NetworkProcess/Notifications/Cocoa/WebPushDaemonConnectionCocoa.mm

@@ -62 +62 @@
         return;
     auto messageLevel = static_cast<JSC::MessageLevel>(xpc_dictionary_get_uint64(request, protocolDebugMessageLevelKey));
-    networkSession().networkProcess().broadcastConsoleMessage(networkSession().sessionID(), MessageSource::PrivateClickMeasurement, messageLevel, String::fromUTF8(debugMessage));
+    networkSession().networkProcess().broadcastConsoleMessage(networkSession().sessionID(), MessageSource::Other, messageLevel, String::fromUTF8(debugMessage));
 }
 

branches/safari-613.1.10-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -160 +160 @@
 
 - (void)_webView:(WKWebView *)webView startXRSessionWithCompletionHandler:(void (^)(id))completionHandler WK_API_AVAILABLE(macos(12.0), ios(15.0));
-- (void)_webView:(WKWebView *)webView requestNotificationPermissionForSecurityOrigin:(WKSecurityOrigin *)securityOrigin decisionHandler:(void (^)(BOOL))decisionHandler WK_API_AVAILABLE(macos(10.13.4));
+- (void)_webView:(WKWebView *)webView requestNotificationPermissionForSecurityOrigin:(WKSecurityOrigin *)securityOrigin decisionHandler:(void (^)(BOOL))decisionHandler WK_API_AVAILABLE(macos(10.13.4), ios(WK_IOS_TBA));
 
 #if TARGET_OS_IPHONE

branches/safari-613.1.10-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1005 +1005 @@
                 515BE1B31D5902DD00DD7C68 /* GamepadData.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1B01D59006900DD7C68 /* GamepadData.h */; };
                 515BE1B51D5917FF00DD7C68 /* UIGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1AD1D555C5100DD7C68 /* UIGamepad.h */; };
+                5160E955274B887200567388 /* AppBundleRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E953274B887100567388 /* AppBundleRequest.mm */; };
+                5160E956274B887200567388 /* AppBundleRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E954274B887100567388 /* AppBundleRequest.h */; };
+                5160E959274C0D8900567388 /* PushAppBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E957274C0D8800567388 /* PushAppBundle.h */; };
+                5160E95A274C0D8900567388 /* PushAppBundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E958274C0D8800567388 /* PushAppBundle.mm */; };
+                5160E95E274C2A0300567388 /* MockAppBundleRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E95C274C2A0300567388 /* MockAppBundleRegistry.h */; };
+                5160E960274C2A4000567388 /* MockAppBundleRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E95F274C2A3F00567388 /* MockAppBundleRegistry.mm */; };
                 5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
                 5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
@@ -1056 +1062 @@
                 51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3282F /* WebMDNSRegisterMessageReceiver.cpp */; };
                 51F060E11654318500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp */; };
+                51F7BB76274498BB00C45A72 /* MockAppBundleForTesting.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB74274498BA00C45A72 /* MockAppBundleForTesting.mm */; };
+                51F7BB77274498BB00C45A72 /* MockAppBundleForTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F7BB75274498BB00C45A72 /* MockAppBundleForTesting.h */; };
                 51F7BB7B2744C50700C45A72 /* PushClientConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F7BB792744C50700C45A72 /* PushClientConnection.h */; };
                 51F7BB7C2744C50700C45A72 /* PushClientConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB7A2744C50700C45A72 /* PushClientConnection.mm */; };
@@ -4293 +4301 @@
                 515C415B207D74E100726E02 /* SuspendedPageProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SuspendedPageProxy.h; sourceTree = "<group>"; };
                 5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
+                5160E953274B887100567388 /* AppBundleRequest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppBundleRequest.mm; sourceTree = "<group>"; };
+                5160E954274B887100567388 /* AppBundleRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppBundleRequest.h; sourceTree = "<group>"; };
+                5160E957274C0D8800567388 /* PushAppBundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushAppBundle.h; sourceTree = "<group>"; };
+                5160E958274C0D8800567388 /* PushAppBundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PushAppBundle.mm; sourceTree = "<group>"; };
+                5160E95C274C2A0300567388 /* MockAppBundleRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockAppBundleRegistry.h; sourceTree = "<group>"; };
+                5160E95F274C2A3F00567388 /* MockAppBundleRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MockAppBundleRegistry.mm; sourceTree = "<group>"; };
                 5164C0941B05B757004F102A /* AuxiliaryProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AuxiliaryProcess.messages.in; sourceTree = "<group>"; };
                 516A4A5B120A2CCD00C05B7F /* APIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIError.h; sourceTree = "<group>"; };
@@ -4400 +4414 @@
                 51F060DD1654317500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkMDNSRegisterMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkMDNSRegisterMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebResourceLoaderMessages.h; path = DerivedSources/WebKit2/WebResourceLoaderMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
+                51F7BB74274498BA00C45A72 /* MockAppBundleForTesting.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MockAppBundleForTesting.mm; sourceTree = "<group>"; };
+                51F7BB75274498BB00C45A72 /* MockAppBundleForTesting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockAppBundleForTesting.h; sourceTree = "<group>"; };
                 51F7BB792744C50700C45A72 /* PushClientConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushClientConnection.h; sourceTree = "<group>"; };
                 51F7BB7A2744C50700C45A72 /* PushClientConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PushClientConnection.mm; sourceTree = "<group>"; };
@@ -9798 +9814 @@
                         children = (
                                 5CBB6D4D271F67CC00FD1A5D /* com.apple.webkit.webpushd.plist */,
+                                5160E954274B887100567388 /* AppBundleRequest.h */,
+                                5160E953274B887100567388 /* AppBundleRequest.mm */,
+                                51F7BB75274498BB00C45A72 /* MockAppBundleForTesting.h */,
+                                51F7BB74274498BA00C45A72 /* MockAppBundleForTesting.mm */,
+                                5160E95C274C2A0300567388 /* MockAppBundleRegistry.h */,
+                                5160E95F274C2A3F00567388 /* MockAppBundleRegistry.mm */,
+                                5160E957274C0D8800567388 /* PushAppBundle.h */,
+                                5160E958274C0D8800567388 /* PushAppBundle.mm */,
                                 51F7BB792744C50700C45A72 /* PushClientConnection.h */,
                                 51F7BB7A2744C50700C45A72 /* PushClientConnection.mm */,
@@ -12339 +12363 @@
                         buildActionMask = 2147483647;
                         files = (
+                                5160E959274C0D8900567388 /* PushAppBundle.h in Headers */,
+                                51F7BB7B2744C50700C45A72 /* PushClientConnection.h in Headers */,
+                                5160E95E274C2A0300567388 /* MockAppBundleRegistry.h in Headers */,
                                 5C1579FC2717AF5000ED5280 /* DaemonUtilities.h in Headers */,
-                                51F7BB7B2744C50700C45A72 /* PushClientConnection.h in Headers */,
+                                5160E956274B887200567388 /* AppBundleRequest.h in Headers */,
                                 512CD69F2723393A00F7F8EC /* WebPushDaemon.h in Headers */,
+                                51F7BB77274498BB00C45A72 /* MockAppBundleForTesting.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -14830 +14858 @@
                                 51F7BB7D2745640400C45A72 /* CodeSigning.mm in Sources */,
                                 5C1579FF2717B6D200ED5280 /* DaemonDecoder.cpp in Sources */,
+                                51F7BB76274498BB00C45A72 /* MockAppBundleForTesting.mm in Sources */,
+                                5160E955274B887200567388 /* AppBundleRequest.mm in Sources */,
+                                5160E95A274C0D8900567388 /* PushAppBundle.mm in Sources */,
+                                5160E960274C2A4000567388 /* MockAppBundleRegistry.mm in Sources */,
+                                51F7BB7C2744C50700C45A72 /* PushClientConnection.mm in Sources */,
                                 5C1579FE2717B6C100ED5280 /* DaemonEncoder.cpp in Sources */,
                                 5C1579FB2717AF5000ED5280 /* DaemonUtilities.mm in Sources */,
-                                51F7BB7C2744C50700C45A72 /* PushClientConnection.mm in Sources */,
                                 512CD6A02723393A00F7F8EC /* WebPushDaemon.mm in Sources */,
                                 5C157A0C2717CA1D00ED5280 /* WebPushDaemonMain.mm in Sources */,

branches/safari-613.1.10-branch/Source/WebKit/webpushd/MockAppBundleForTesting.h

@@ -26 +26 @@
 #pragma once
 
-#include <optional>
-#include <wtf/Forward.h>
-#include <wtf/OSObjectPtr.h>
-#include <wtf/spi/darwin/XPCSPI.h>
+#include "PushAppBundle.h"
+#include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebPushD {
 
-class ClientConnection {
+class MockAppBundleForTesting : public PushAppBundle {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    ClientConnection(xpc_connection_t);
+    static Ref<MockAppBundleForTesting> create(const String& originString, const String& hostAppBundleIdentifier, PushAppBundleClient& client)
+    {
+        return adoptRef(*new MockAppBundleForTesting(originString, hostAppBundleIdentifier, client));
+    }
 
-    bool hasHostAppAuditToken() const { return !!m_hostAppAuditToken; }
-    void setHostAppAuditTokenData(const Vector<uint8_t>&);
-
-    const String& hostAppCodeSigningIdentifier();
-    bool hostAppHasPushEntitlement();
-
-    bool debugModeIsEnabled() const { return m_debugModeEnabled; }
-    void setDebugModeIsEnabled(bool);
+    ~MockAppBundleForTesting() final = default;
 
 private:
-    OSObjectPtr<xpc_connection_t> m_xpcConnection;
+    MockAppBundleForTesting(const String& originString, const String& hostAppBundleIdentifier, PushAppBundleClient&);
 
-    std::optional<audit_token_t> m_hostAppAuditToken;
-    std::optional<String> m_hostAppCodeSigningIdentifier;
-    std::optional<bool> m_hostAppHasPushEntitlement;
+    void checkForExistingBundle() final;
+    void deleteExistingBundle() final;
+    void createBundle() final;
+    void stop() final;
 
-    bool m_debugModeEnabled { false };
+    String m_originString;
+    String m_hostAppBundleIdentifier;
 };
 
+
 } // namespace WebPushD

branches/safari-613.1.10-branch/Source/WebKit/webpushd/MockAppBundleRegistry.h

@@ -26 +26 @@
 #pragma once
 
-#include <optional>
-#include <wtf/Forward.h>
-#include <wtf/OSObjectPtr.h>
-#include <wtf/spi/darwin/XPCSPI.h>
+#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
+#include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebPushD {
 
-class ClientConnection {
-    WTF_MAKE_FAST_ALLOCATED;
+class MockAppBundleForTesting;
+
+class MockAppBundleRegistry {
+    friend class MockAppBundleForTesting;
 public:
-    ClientConnection(xpc_connection_t);
+    static MockAppBundleRegistry& singleton();
 
-    bool hasHostAppAuditToken() const { return !!m_hostAppAuditToken; }
-    void setHostAppAuditTokenData(const Vector<uint8_t>&);
-
-    const String& hostAppCodeSigningIdentifier();
-    bool hostAppHasPushEntitlement();
-
-    bool debugModeIsEnabled() const { return m_debugModeEnabled; }
-    void setDebugModeIsEnabled(bool);
+    Vector<String> getOriginsWithRegistrations(const String& hostAppBundleIdentifier);
 
 private:
-    OSObjectPtr<xpc_connection_t> m_xpcConnection;
+    bool doesBundleExist(const String& hostAppBundleIdentifier, const String& originString);
+    void createBundle(const String& hostAppBundleIdentifier, const String& originString);
+    void deleteBundle(const String& hostAppBundleIdentifier, const String& originString);
 
-    std::optional<audit_token_t> m_hostAppAuditToken;
-    std::optional<String> m_hostAppCodeSigningIdentifier;
-    std::optional<bool> m_hostAppHasPushEntitlement;
-
-    bool m_debugModeEnabled { false };
+    HashMap<String, HashSet<String>> m_registeredBundleMap;
 };
 

branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushAppBundle.h

@@ -26 +26 @@
 #pragma once
 
-#include <optional>
-#include <wtf/Forward.h>
-#include <wtf/OSObjectPtr.h>
-#include <wtf/spi/darwin/XPCSPI.h>
-#include <wtf/text/WTFString.h>
+#include <wtf/RefCounted.h>
+
+@class NSError;
 
 namespace WebPushD {
 
-class ClientConnection {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    ClientConnection(xpc_connection_t);
-
-    bool hasHostAppAuditToken() const { return !!m_hostAppAuditToken; }
-    void setHostAppAuditTokenData(const Vector<uint8_t>&);
-
-    const String& hostAppCodeSigningIdentifier();
-    bool hostAppHasPushEntitlement();
-
-    bool debugModeIsEnabled() const { return m_debugModeEnabled; }
-    void setDebugModeIsEnabled(bool);
-
-private:
-    OSObjectPtr<xpc_connection_t> m_xpcConnection;
-
-    std::optional<audit_token_t> m_hostAppAuditToken;
-    std::optional<String> m_hostAppCodeSigningIdentifier;
-    std::optional<bool> m_hostAppHasPushEntitlement;
-
-    bool m_debugModeEnabled { false };
+enum class PushAppBundleExists : bool {
+    No,
+    Yes,
 };
 
+enum class PushAppBundleCreationResult : bool {
+    Failure,
+    Success,
+};
+
+class PushAppBundle;
+
+class PushAppBundleClient {
+public:
+    virtual ~PushAppBundleClient();
+
+    virtual void didCheckForExistingBundle(PushAppBundle&, PushAppBundleExists) = 0;
+    virtual void didDeleteExistingBundleWithError(PushAppBundle&, NSError *) = 0;
+    virtual void didCreateAppBundle(PushAppBundle&, PushAppBundleCreationResult) = 0;
+};
+
+class PushAppBundle : public RefCounted<PushAppBundle> {
+public:
+    virtual ~PushAppBundle();
+    void detachFromClient();
+
+    virtual void checkForExistingBundle() = 0;
+    virtual void deleteExistingBundle() = 0;
+    virtual void createBundle() = 0;
+    virtual void stop() = 0;
+
+protected:
+    PushAppBundle(PushAppBundleClient&);
+
+    PushAppBundleClient* m_client;
+};
+
+
 } // namespace WebPushD

branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushAppBundle.mm

@@ -24 +24 @@
  */
 
-#pragma once
-
-#include <optional>
-#include <wtf/Forward.h>
-#include <wtf/OSObjectPtr.h>
-#include <wtf/spi/darwin/XPCSPI.h>
-#include <wtf/text/WTFString.h>
+#import "config.h"
+#import "PushAppBundle.h"
 
 namespace WebPushD {
 
-class ClientConnection {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    ClientConnection(xpc_connection_t);
+PushAppBundleClient::~PushAppBundleClient()
+{
+}
 
-    bool hasHostAppAuditToken() const { return !!m_hostAppAuditToken; }
-    void setHostAppAuditTokenData(const Vector<uint8_t>&);
+PushAppBundle::PushAppBundle(PushAppBundleClient& client)
+    : m_client(&client)
+{
+}
 
-    const String& hostAppCodeSigningIdentifier();
-    bool hostAppHasPushEntitlement();
+PushAppBundle::~PushAppBundle()
+{
+    ASSERT(!m_client);
+}
 
-    bool debugModeIsEnabled() const { return m_debugModeEnabled; }
-    void setDebugModeIsEnabled(bool);
-
-private:
-    OSObjectPtr<xpc_connection_t> m_xpcConnection;
-
-    std::optional<audit_token_t> m_hostAppAuditToken;
-    std::optional<String> m_hostAppCodeSigningIdentifier;
-    std::optional<bool> m_hostAppHasPushEntitlement;
-
-    bool m_debugModeEnabled { false };
-};
+void PushAppBundle::detachFromClient()
+{
+    stop();
+    m_client = nullptr;
+}
 
 } // namespace WebPushD

branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushClientConnection.h

@@ -27 +27 @@
 
 #include <optional>
+#include <wtf/Deque.h>
 #include <wtf/Forward.h>
 #include <wtf/OSObjectPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/spi/darwin/XPCSPI.h>
 #include <wtf/text/WTFString.h>
@@ -34 +37 @@
 namespace WebPushD {
 
-class ClientConnection {
+class AppBundleRequest;
+
+class ClientConnection : public RefCounted<ClientConnection>, public CanMakeWeakPtr<ClientConnection> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    ClientConnection(xpc_connection_t);
+    static Ref<ClientConnection> create(xpc_connection_t);
 
     bool hasHostAppAuditToken() const { return !!m_hostAppAuditToken; }
@@ -48 +53 @@
     void setDebugModeIsEnabled(bool);
 
+    void enqueueAppBundleRequest(std::unique_ptr<AppBundleRequest>&&);
+    void didCompleteAppBundleRequest(AppBundleRequest&);
+
+    void connectionClosed();
+
 private:
+    ClientConnection(xpc_connection_t);
+
+    void maybeStartNextAppBundleRequest();
+    
     OSObjectPtr<xpc_connection_t> m_xpcConnection;
 
@@ -55 +69 @@
     std::optional<bool> m_hostAppHasPushEntitlement;
 
+    Deque<std::unique_ptr<AppBundleRequest>> m_pendingBundleRequests;
+    std::unique_ptr<AppBundleRequest> m_currentBundleRequest;
+
     bool m_debugModeEnabled { false };
 };

branches/safari-613.1.10-branch/Source/WebKit/webpushd/PushClientConnection.mm

@@ -27 +27 @@
 #import "PushClientConnection.h"
 
+#import "AppBundleRequest.h"
 #import "CodeSigning.h"
 #import "WebPushDaemon.h"
@@ -34 +35 @@
 
 namespace WebPushD {
+
+Ref<ClientConnection> ClientConnection::create(xpc_connection_t connection)
+{
+    return adoptRef(*new ClientConnection(connection));
+}
 
 ClientConnection::ClientConnection(xpc_connection_t connection)
@@ -94 +100 @@
 }
 
+void ClientConnection::enqueueAppBundleRequest(std::unique_ptr<AppBundleRequest>&& request)
+{
+    RELEASE_ASSERT(m_xpcConnection);
+    m_pendingBundleRequests.append(WTFMove(request));
+    maybeStartNextAppBundleRequest();
+}
+
+void ClientConnection::maybeStartNextAppBundleRequest()
+{
+    RELEASE_ASSERT(m_xpcConnection);
+
+    if (m_currentBundleRequest || m_pendingBundleRequests.isEmpty())
+        return;
+
+    m_currentBundleRequest = m_pendingBundleRequests.takeFirst();
+    m_currentBundleRequest->start();
+}
+
+void ClientConnection::didCompleteAppBundleRequest(AppBundleRequest& request)
+{
+    // If our connection was closed there should be no in-progress bundle requests.
+    RELEASE_ASSERT(m_xpcConnection);
+
+    ASSERT(m_currentBundleRequest.get() == &request);
+    m_currentBundleRequest = nullptr;
+
+    maybeStartNextAppBundleRequest();
+}
+
+void ClientConnection::connectionClosed()
+{
+    RELEASE_ASSERT(m_xpcConnection);
+    m_xpcConnection = nullptr;
+
+    if (m_currentBundleRequest) {
+        m_currentBundleRequest->cancel();
+        m_currentBundleRequest = nullptr;
+    }
+
+    Deque<std::unique_ptr<AppBundleRequest>> pendingBundleRequests;
+    pendingBundleRequests.swap(m_pendingBundleRequests);
+    for (auto& requst : pendingBundleRequests)
+        requst->cancel();
+}
+
 } // namespace WebPushD

branches/safari-613.1.10-branch/Source/WebKit/webpushd/WebPushDaemon.h

@@ -72 +72 @@
 
     ClientConnection* toClientConnection(xpc_connection_t);
-
-    HashSet<String> m_inMemoryOriginStringsWithPermissionForTesting;
-
-    HashMap<xpc_connection_t, std::unique_ptr<ClientConnection>> m_connectionMap;
+    HashMap<xpc_connection_t, Ref<ClientConnection>> m_connectionMap;
 };
 

branches/safari-613.1.10-branch/Source/WebKit/webpushd/WebPushDaemon.mm

@@ -27 +27 @@
 #import "WebPushDaemon.h"
 
+#import "AppBundleRequest.h"
 #import "DaemonDecoder.h"
 #import "DaemonEncoder.h"
 #import "DaemonUtilities.h"
 #import "HandleMessage.h"
+#import "MockAppBundleRegistry.h"
 #import "WebPushDaemonConstants.h"
 
@@ -181 +183 @@
 {
     RELEASE_ASSERT(!m_connectionMap.contains(connection));
-    m_connectionMap.set(connection, WTF::makeUnique<ClientConnection>(connection));
+    m_connectionMap.set(connection, ClientConnection::create(connection));
 }
 
@@ -187 +189 @@
 {
     RELEASE_ASSERT(m_connectionMap.contains(connection));
-    m_connectionMap.remove(connection);
+    auto clientConnection = m_connectionMap.take(connection);
+    clientConnection->connectionClosed();
 }
 
@@ -254 +257 @@
     }
 
-    // FIXME: This is for an API testing checkpoint
-    // Next step is actually perform a persistent permissions request on a per-platform basis
-    m_inMemoryOriginStringsWithPermissionForTesting.add(originString);
-    replySender(true);
+    connection->enqueueAppBundleRequest(makeUnique<AppBundlePermissionsRequest>(*connection, originString, WTFMove(replySender)));
 }
 
@@ -267 +267 @@
     }
 
-    // FIXME: This is for an API testing checkpoint
-    // Next step is actually gather persistent permissions from the system on a per-platform basis
-    replySender(copyToVector(m_inMemoryOriginStringsWithPermissionForTesting));
+    // FIXME: This will need platform-specific implementations for real world bundles once implemented.
+    replySender(MockAppBundleRegistry::singleton().getOriginsWithRegistrations(connection->hostAppCodeSigningIdentifier()));
 }
 
@@ -279 +278 @@
     }
 
-    // FIXME: This is for an API testing checkpoint
-    // Next step is actually delete any persistent permissions on a per-platform basis
-    if (m_inMemoryOriginStringsWithPermissionForTesting.remove(originString))
-        replySender("");
-    else
-        replySender(makeString("Origin ", originString, " not registered for push or notifications"));
+    connection->enqueueAppBundleRequest(makeUnique<AppBundleDeletionRequest>(*connection, originString, WTFMove(replySender)));
 }
 

branches/safari-613.1.10-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm

@@ -159 +159 @@
 
 // FIXME: Re-enable this test for Monterey+ once webkit.org/232857 is resolved.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 110000 || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
+#if PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED < 110000 || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
 TEST(WebPushD, DISABLED_BasicCommunication)
 #else
@@ -256 +256 @@
 
 // FIXME: Re-enable this test for Monterey+ once webkit.org/232857 is resolved.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 110000 || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
+#if PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED < 110000 || __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
 TEST(WebPushD, DISABLED_PermissionManagement)
 #else