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

Add "disablewebsecurity" attribute for <webview>

Browse source
This commit is contained in:
Cheng Zhao 2014-12-17 16:32:25 -08:00
parent 6d168b89ef
commit c92d2531b5
6 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/lib/guest-view-manager.coffee
View file

@ -93,6 +93,7 @@ attachGuest = (embedder, elementInstanceId, guestInstanceId, params) ->
webViewManager.addGuest guestInstanceId, elementInstanceId, embedder, guest, webViewManager.addGuest guestInstanceId, elementInstanceId, embedder, guest,
nodeIntegration: params.nodeintegration nodeIntegration: params.nodeintegration
plugins: params.plugins plugins: params.plugins
disableWebSecurity: params.disablewebsecurity
preloadUrl: params.preload ? '' preloadUrl: params.preload ? ''
guest.attachParams = params guest.attachParams = params

8
atom/browser/web_view/web_view_manager.cc
View file

@ -41,7 +41,8 @@ struct Converter<atom::WebViewManager::WebViewOptions> {
return false; return false;
return options.Get("nodeIntegration", &(out->node_integration)) && return options.Get("nodeIntegration", &(out->node_integration)) &&
options.Get("plugins", &(out->plugins)) && options.Get("plugins", &(out->plugins)) &&
options.Get("preloadUrl", &(out->preload_url)); options.Get("preloadUrl", &(out->preload_url)) &&
options.Get("disableWebSecurity", &(out->disable_web_security));
} }
}; };
@ -63,7 +64,10 @@ void WebViewManager::AddGuest(int guest_instance_id,
web_contents_map_[guest_instance_id] = { web_contents, embedder }; web_contents_map_[guest_instance_id] = { web_contents, embedder };
WebViewRendererState::WebViewInfo web_view_info = { WebViewRendererState::WebViewInfo web_view_info = {
guest_instance_id, options.node_integration, options.plugins guest_instance_id,
options.node_integration,
options.plugins,
options.disable_web_security,
}; };
net::FileURLToFilePath(options.preload_url, &web_view_info.preload_script); net::FileURLToFilePath(options.preload_url, &web_view_info.preload_script);
content::BrowserThread::PostTask( content::BrowserThread::PostTask(

1
atom/browser/web_view/web_view_manager.h
View file

@ -24,6 +24,7 @@ class WebViewManager : public content::BrowserPluginGuestManager {
struct WebViewOptions { struct WebViewOptions {
bool node_integration; bool node_integration;
bool plugins; bool plugins;
bool disable_web_security;
GURL preload_url; GURL preload_url;
}; };

1
atom/browser/web_view/web_view_renderer_state.h
View file

@ -24,6 +24,7 @@ class WebViewRendererState {
int guest_instance_id; int guest_instance_id;
bool node_integration; bool node_integration;
bool plugins; bool plugins;
bool disable_web_security;
base::FilePath preload_script; base::FilePath preload_script;
}; };

1
atom/renderer/lib/web-view/web-view-attributes.coffee
View file

@ -195,6 +195,7 @@ WebViewImpl::setupWebViewAttributes = ->
@attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this) @attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this)
@attributes[webViewConstants.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(webViewConstants.ATTRIBUTE_NODEINTEGRATION, this) @attributes[webViewConstants.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(webViewConstants.ATTRIBUTE_NODEINTEGRATION, this)
@attributes[webViewConstants.ATTRIBUTE_PLUGINS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_PLUGINS, this) @attributes[webViewConstants.ATTRIBUTE_PLUGINS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_PLUGINS, this)
@attributes[webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY, this)
@attributes[webViewConstants.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this) @attributes[webViewConstants.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this)
autosizeAttributes = [ autosizeAttributes = [

1
atom/renderer/lib/web-view/web-view-constants.coffee
View file

@ -12,6 +12,7 @@ module.exports =
ATTRIBUTE_HTTPREFERRER: 'httpreferrer' ATTRIBUTE_HTTPREFERRER: 'httpreferrer'
ATTRIBUTE_NODEINTEGRATION: 'nodeintegration' ATTRIBUTE_NODEINTEGRATION: 'nodeintegration'
ATTRIBUTE_PLUGINS: 'plugins' ATTRIBUTE_PLUGINS: 'plugins'
ATTRIBUTE_DISABLEWEBSECURITY: 'disablewebsecurity'
ATTRIBUTE_PRELOAD: 'preload' ATTRIBUTE_PRELOAD: 'preload'
# Internal attribute. # Internal attribute.