github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: use no-op header client for Fetch-intercepted requests (#51372)

Browse Source 
fix: use no-op header client for Fetch-intercepted requests (#50744)

* fix: use the non-pass-through path for Fetch-intercepted requests

* Revert "fix: use the non-pass-through path for Fetch-intercepted requests"

This reverts commit 395fb8bb8c.

* fix: use no-op header client for Fetch-intercepted requests

* fix: bring back `DCHECK` that was prematurely removed

* style: reformat code

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Noah Gregory <noahmgregory@gmail.com>
This commit is contained in:
trop[bot]
2026-04-29 21:55:38 -05:00
committed by GitHub
parent 8f58d582d5
commit c851e5cc86
2 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
shell/browser/net/proxying_url_loader_factory.cc
View File

@@ -13,6 +13,7 @@
#include "base/strings/string_split.h"
#include "content/public/browser/browser_context.h"
#include "extensions/browser/extension_navigation_ui_data.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "net/base/completion_repeating_callback.h"
#include "net/base/load_flags.h"
#include "net/http/http_response_headers.h"
@@ -29,6 +30,30 @@
namespace electron {
namespace {
class NoOpHeaderClient final : public network::mojom::TrustedHeaderClient {
public:
NoOpHeaderClient() = default;
NoOpHeaderClient(const NoOpHeaderClient&) = delete;
NoOpHeaderClient& operator=(const NoOpHeaderClient&) = delete;
~NoOpHeaderClient() override = default;
void OnBeforeSendHeaders(const net::HttpRequestHeaders& headers,
OnBeforeSendHeadersCallback callback) override {
std::move(callback).Run(net::OK, std::nullopt);
}
void OnHeadersReceived(const std::string& headers,
const net::IPEndPoint& remote_endpoint,
const std::optional<net::SSLInfo>& ssl_info,
OnHeadersReceivedCallback callback) override {
std::move(callback).Run(net::OK, std::nullopt, std::nullopt);
}
};
} // namespace
ProxyingURLLoaderFactory::InProgressRequest::FollowRedirectParams::
FollowRedirectParams() = default;
ProxyingURLLoaderFactory::InProgressRequest::FollowRedirectParams::
@@ -869,8 +894,14 @@ void ProxyingURLLoaderFactory::OnLoaderCreated(
int32_t request_id,
mojo::PendingReceiver<network::mojom::TrustedHeaderClient> receiver) {
auto it = network_request_id_to_web_request_id_.find(request_id);
if (it == network_request_id_to_web_request_id_.end())
if (it == network_request_id_to_web_request_id_.end()) {
// Chromium can require the header client pipe to be bound even when
// Electron is using the pass-through path. Dropping the receiver here
// disconnects the URLLoader and causes the request to fail with ERR_FAILED.
mojo::MakeSelfOwnedReceiver(std::make_unique<NoOpHeaderClient>(),
std::move(receiver));
return;
}
auto request_it = requests_.find(it->second);
DCHECK(request_it != requests_.end());

38
spec/api-debugger-spec.ts
View File

@@ -180,6 +180,44 @@ describe('debugger module', () => {
await loadingFinished;
});
it('can continue a Fetch-paused document navigation without webRequest listeners', async () => {
server = http.createServer((_req, res) => {
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end('<!DOCTYPE html><html><body><h1>Hello World</h1></body></html>');
});
const { port } = await listen(server);
const url = `http://localhost:${port}`;
const continueRequests: Array<Promise<any>> = [];
const onMessage = (_event: Electron.Event, method: string, params: any) => {
if (method === 'Fetch.requestPaused') {
continueRequests.push(
w.webContents.debugger.sendCommand('Fetch.continueRequest', {
requestId: params.requestId
})
);
}
};
w.webContents.debugger.attach();
w.webContents.debugger.on('message', onMessage);
try {
await w.webContents.debugger.sendCommand('Fetch.enable', {
patterns: [{ resourceType: 'Document' }]
});
await expect(w.loadURL(url)).to.eventually.be.fulfilled();
await Promise.all(continueRequests);
} finally {
w.webContents.debugger.off('message', onMessage);
if (w.webContents.debugger.isAttached()) {
w.webContents.debugger.detach();
}
}
});
it('can get and set cookies using the Storage API', async () => {
await w.webContents.loadURL('about:blank');
w.webContents.debugger.attach('1.1');