Skip to content

Commit

Permalink
fix: do not reset process_id in URLLoaderFactoryParams (#25178)
Browse files Browse the repository at this point in the history
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
  • Loading branch information
trop[bot] and zcbenz committed Aug 28, 2020
1 parent 66b6789 commit 4ea6af6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
13 changes: 4 additions & 9 deletions shell/browser/electron_browser_client.cc
Expand Up @@ -1516,15 +1516,10 @@ void ElectronBrowserClient::OverrideURLLoaderFactoryParams(
const url::Origin& origin,
bool is_for_isolated_world,
network::mojom::URLLoaderFactoryParams* factory_params) {
for (const auto& iter : process_preferences_) {
if (iter.second.browser_context != browser_context)
continue;

if (!iter.second.web_security) {
// bypass CORB
factory_params->process_id = iter.first;
factory_params->is_corb_enabled = false;
}
// Bypass CORB when web security is disabled.
auto it = process_preferences_.find(factory_params->process_id);
if (it != process_preferences_.end() && !it->second.web_security) {
factory_params->is_corb_enabled = false;
}

extensions::URLLoaderFactoryManager::OverrideURLLoaderFactoryParams(
Expand Down
8 changes: 8 additions & 0 deletions spec-main/chromium-spec.ts
Expand Up @@ -245,6 +245,14 @@ describe('web security', () => {
<script src="${serverUrl}"></script>`);
await p;
});

it('does not crash when multiple WebContent are created with web security disabled', () => {
const options = { webPreferences: { webSecurity: false } };
const w1 = new BrowserWindow(options);
w1.loadURL(serverUrl);
const w2 = new BrowserWindow(options);
w2.loadURL(serverUrl);
});
});

describe('command line switches', () => {
Expand Down

0 comments on commit 4ea6af6

Please sign in to comment.