Changeset 286788 in webkit for trunk/Source/WebKit/webpushd/webpushtool/WebPushToolConnection.h

Timestamp:

Dec 9, 2021, 10:58:34 AM (3 years ago)

Author:

beidson@apple.com

Message:

Add ability to inject messages into webpushd
​https://bugs.webkit.org/show_bug.cgi?id=233988

Reviewed by Alex Christensen.

Source/WebKit:

Covered by API tests.

This patch:

• Adds WKWebsiteDataStore SPI to fetch pending push messages for the embedding application
• Gives webpushd code to inject a push message for a given bundle identifier
• Gives webpushtool the ability to send one of these fake messages
• Gives webpushtool the ability to reconnect to the next daemon instance after the current connection is dropped
• Tests the injection and fetching of push messages via TestWebKitAPI

• Configurations/webpushtool.xcconfig:
• WebKit.xcodeproj/project.pbxproj:
• Resources/webpushtool.entitlements:

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::getPendingPushMessages):
(WebKit::NetworkProcess::processPushMessage):

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/NetworkProcess.messages.in:

• NetworkProcess/Notifications/NetworkNotificationManager.cpp:

(WebKit::NetworkNotificationManager::getPendingPushMessages):
(WebKit::ReplyCaller<Vector<WebPushMessage>::callReply):

• NetworkProcess/Notifications/NetworkNotificationManager.h:

• Shared/Cocoa/WebPushMessageCocoa.mm: Copied from Source/WebKit/webpushd/webpushtool/WebPushToolConnection.h.

(WebKit::WebPushMessage::fromDictionary):
(WebKit::WebPushMessage::toDictionary const):

• Shared/PushMessageForTesting.h: Copied from Source/WebKit/Shared/WebPushDaemonConstants.h.

(WebKit::WebPushD::PushMessageForTesting::encode const):
(WebKit::WebPushD::PushMessageForTesting::decode):

• Shared/WebPushDaemonConstants.h:

(WebKit::WebPushD::messageTypeSendsReply):

• Shared/WebPushMessage.h: Copied from Source/WebKit/webpushd/webpushtool/WebPushToolConnection.h.

(WebKit::WebPushMessage::encode const):
(WebKit::WebPushMessage::decode):

• UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _getPendingPushMessages:]):
(-[WKWebsiteDataStore _processPushMessage:completionHandler:]):
(-[WKWebsiteDataStore _processPushMessage:registration:completionHandler:]): Deleted.

• UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:

• UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::getPendingPushMessages):
(WebKit::NetworkProcessProxy::processPushMessage):

• UIProcess/Network/NetworkProcessProxy.h:

• webpushd/PushClientConnection.h:
• webpushd/PushClientConnection.mm:

(WebPushD::ClientConnection::hostAppHasPushEntitlement):
(WebPushD::ClientConnection::hostAppHasPushInjectEntitlement):
(WebPushD::ClientConnection::hostHasEntitlement):
(WebPushD::ClientConnection::broadcastDebugMessage):

• webpushd/WebPushDaemon.h:
• webpushd/WebPushDaemon.mm:

(WebPushD::MessageInfo::injectPushMessageForTesting::encodeReply):
(WebPushD::MessageInfo::getPendingPushMessages::encodeReply):
(WebPushD::Daemon::decodeAndHandleMessage):
(WebPushD::Daemon::injectPushMessageForTesting):
(WebPushD::Daemon::getPendingPushMessages):

• webpushd/webpushtool/WebPushToolConnection.h:

(WebPushTool::Connection::setPushMessage):

• webpushd/webpushtool/WebPushToolConnection.mm:

(WebPushTool::Connection::startAction):
(WebPushTool::Connection::sendPushMessage):

• webpushd/webpushtool/WebPushToolMain.mm:

(printUsageAndTerminate):
(pushMessageFromArguments):
(main):

Tools:

• TestWebKitAPI/Configurations/TestWebKitAPI-iOS.entitlements:
• TestWebKitAPI/Configurations/TestWebKitAPI-macOS-internal.entitlements:
• TestWebKitAPI/Configurations/TestWebKitAPI-macOS.entitlements:

• TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm:

(messageDictionary):

• TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm:

(TestWebKitAPI::createMessageDictionary):
(TestWebKitAPI::sendMessageToDaemon):
(TestWebKitAPI::sendMessageToDaemonWaitingForReply):
(TestWebKitAPI::sendConfigurationWithAuditToken):
(TestWebKitAPI::createAndConfigureConnectionToService):
(TestWebKitAPI::encodeString):
(TestWebKitAPI::TEST):
(TestWebKitAPI::function):

• TestWebKitAPI/cocoa/TestWKWebView.h:

File:

• trunk/Source/WebKit/webpushd/webpushtool/WebPushToolConnection.h (modified) (3 diffs)

trunk/Source/WebKit/webpushd/webpushtool/WebPushToolConnection.h

@@ -26 +26 @@
 #pragma once
 
+
 #include <memory>
 #include <wtf/RetainPtr.h>
+
 #include <wtf/WeakPtr.h>
 #include <wtf/spi/darwin/XPCSPI.h>
+
+
 
 namespace WebPushTool {
@@ -55 +59 @@
     void connectToService();
 
+
+
 private:
     void messageReceived(xpc_object_t);
@@ -61 +67 @@
     void startAction();
     void startDebugStreamAction();
+
 
     void sendAuditToken();
-    
+
     Action m_action;
     bool m_reconnect { false };
     RetainPtr<xpc_connection_t> m_connection;
     const char* m_serviceName;
+
+
 };