Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: properly handle optional requestHeaders with onBeforeSendHeaders #29834

Merged
merged 1 commit into from Jun 23, 2021
Merged

fix: properly handle optional requestHeaders with onBeforeSendHeaders #29834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions shell/browser/api/electron_api_web_request.cc
View file
Open in desktop
Expand Up @@ -214,8 +214,11 @@ void ReadFromResponse(v8::Isolate* isolate,
void ReadFromResponse(v8::Isolate* isolate,
gin::Dictionary* response,
net::HttpRequestHeaders* headers) {
headers->Clear();
response->Get("requestHeaders", headers);
v8::Local<v8::Value> value;
if (response->Get("requestHeaders", &value) && value->IsObject()) {
headers->Clear();
gin::Converter<net::HttpRequestHeaders>::FromV8(isolate, value, headers);
}
}

void ReadFromResponse(v8::Isolate* isolate,
Expand Down
12 changes: 12 additions & 0 deletions spec-main/api-web-request-spec.ts
View file
Open in desktop
Expand Up @@ -214,6 +214,18 @@ describe('webRequest module', () => {
await ajax(defaultURL);
});

it('leaves headers unchanged when no requestHeaders in callback', async () => {
let originalRequestHeaders: Record<string, string>;
ses.webRequest.onBeforeSendHeaders((details, callback) => {
originalRequestHeaders = details.requestHeaders;
callback({});
});
ses.webRequest.onSendHeaders((details) => {
expect(details.requestHeaders).to.deep.equal(originalRequestHeaders);
});
await ajax(defaultURL);
});

it('works with file:// protocol', async () => {
const requestHeaders = {
Test: 'header'
Expand Down