mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #9950 from alexstrat/fix-content-script-insecure-contents

Browse source 
Fix mixed content errors when loading content from `chrome-extension`
This commit is contained in:
Cheng Zhao 2017-09-15 20:45:57 +09:00 • committed by GitHub
commit 800ba9a325
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/renderer/renderer_client_base.cc
View file

@ -89,6 +89,22 @@ void RendererClientBase::RenderThreadStarted() {
blink::WebCustomElement::AddEmbedderCustomElementName("webview"); blink::WebCustomElement::AddEmbedderCustomElementName("webview");
blink::WebCustomElement::AddEmbedderCustomElementName("browserplugin"); blink::WebCustomElement::AddEmbedderCustomElementName("browserplugin");
WTF::String extension_scheme("chrome-extension");
// Extension resources are HTTP-like and safe to expose to the fetch API. The
// rules for the fetch API are consistent with XHR.
blink::SchemeRegistry::RegisterURLSchemeAsSupportingFetchAPI(
extension_scheme);
// Extension resources, when loaded as the top-level document, should bypass
// Blink's strict first-party origin checks.
blink::SchemeRegistry::RegisterURLSchemeAsFirstPartyWhenTopLevel(
extension_scheme);
// In Chrome we should set extension's origins to match the pages they can
// work on, but in Electron currently we just let extensions do anything.
blink::SchemeRegistry::RegisterURLSchemeAsSecure(extension_scheme);
blink::SchemeRegistry::RegisterURLSchemeAsCORSEnabled(extension_scheme);
blink::SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
extension_scheme);
// Parse --secure-schemes=scheme1,scheme2 // Parse --secure-schemes=scheme1,scheme2
std::vector<std::string> secure_schemes_list = std::vector<std::string> secure_schemes_list =
ParseSchemesCLISwitch(switches::kSecureSchemes); ParseSchemesCLISwitch(switches::kSecureSchemes);