dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb+LibWebView+WebWorker: Initialize transport peer pid on Windows

Browse source 
WebWorker control connections can transfer handles from the browser
process to the worker process, including RequestServer and ImageDecoder
transport handles sent during worker startup. On Windows, serializing
those attachments needs the destination process id so DuplicateHandle
and WSADuplicateSocketW can target the peer process. WebWorker was
excluded from the generic helper-process InitTransport handshake,
leaving the transport without a peer pid before any attachment-bearing
message was sent.

Add InitTransport to the WebWorker server endpoint, implement the
server-side peer pid exchange, expose the message type through
WebWorkerClient, and let the shared helper launcher perform the
handshake for workers as it does for other Windows IPC clients.
This commit is contained in:
Aliaksandr Kalenik 2026-06-18 03:23:15 +02:00 committed by Alexander Kalenik
parent 7bb200a663
commit 1b5bdb2b41
5 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Libraries/LibWeb/Worker/WebWorkerServer.ipc
View file

@ -9,6 +9,7 @@
#include <LibWeb/HTML/WorkerAgentTypes.h>
endpoint WebWorkerServer {
init_transport(int peer_pid) => (int peer_pid)
connect_to_request_server(IPC::TransportHandle handle) =|
connect_to_image_decoder(IPC::TransportHandle handle) =|

2
Libraries/LibWebView/HelperProcess.cpp
View file

@ -56,7 +56,7 @@ static ErrorOr<NonnullRefPtr<ClientType>> launch_server_process(
if constexpr (requires { client->set_pid(pid_t {}); })
client->set_pid(process.pid());
if constexpr (requires { client->transport().set_peer_pid(0); } && !IsSame<ClientType, WebWorkerClient>) {
if constexpr (requires { client->transport().set_peer_pid(0); }) {
auto response = client->template send_sync<typename ClientType::InitTransport>(Core::System::getpid());
client->transport().set_peer_pid(response->peer_pid());
}

2
Libraries/LibWebView/WebWorkerClient.h
View file

@ -26,6 +26,8 @@ class WEBVIEW_API WebWorkerClient final
C_OBJECT_ABSTRACT(WebWorkerClient);
public:
using InitTransport = Messages::WebWorkerServer::InitTransport;
explicit WebWorkerClient(NonnullOwnPtr<IPC::Transport>, Web::HTML::WorkerAgentId agent_id);
~WebWorkerClient();

10
Services/WebWorker/ConnectionFromClient.cpp
View file

@ -5,6 +5,7 @@
*/
#include <LibCore/Process.h>
#include <LibCore/System.h>
#include <LibWeb/HTML/BroadcastChannel.h>
#include <LibWeb/HTML/WorkerAgentParent.h>
#include <WebWorker/ConnectionFromClient.h>
@ -13,6 +14,15 @@
namespace WebWorker {
Messages::WebWorkerServer::InitTransportResponse ConnectionFromClient::init_transport([[maybe_unused]] int peer_pid)
{
#ifdef AK_OS_WINDOWS
m_transport->set_peer_pid(peer_pid);
return Core::System::getpid();
#endif
VERIFY_NOT_REACHED();
}
void ConnectionFromClient::connect_to_request_server(IPC::TransportHandle handle)
{
if (on_request_server_connection)

1
Services/WebWorker/ConnectionFromClient.h
View file

@ -30,6 +30,7 @@ public:
virtual void die() override;
virtual Messages::WebWorkerServer::InitTransportResponse init_transport(int peer_pid) override;
virtual void close_worker() override;
void request_file(Web::FileRequest);