Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
make sure there is only one ipc object per frame
Browse files Browse the repository at this point in the history 
fixes brave/browser-laptop#3487
auditors: @bbondy, @diracdeltas
  • Loading branch information
@bridiver
bridiver committed Aug 27, 2016
1 parent d654055 commit faa1d5a
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 66 deletions.
52 changes: 28 additions & 24 deletions atom/common/api/resources/ipc_utils.js
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
var atom = requireNative('atom').GetBinding();
var EventEmitter = require('event_emitter').EventEmitter;
var ipc = atom.ipc;
var atom = requireNative('atom').GetBinding()
var EventEmitter = require('event_emitter').EventEmitter
var ipc = atom.ipc

var slice = [].slice;
var ipcRenderer = new EventEmitter;
var ipcRenderer = atom.v8.getHiddenValue('ipc')
if (!ipcRenderer) {
var slice = [].slice
ipcRenderer = new EventEmitter

ipcRenderer.send = function () {
var args;
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
return ipc.send('ipc-message', slice.call(args));
};
ipcRenderer.send = function () {
var args
args = 1 <= arguments.length ? slice.call(arguments, 0) : []
return ipc.send('ipc-message', slice.call(args))
}

ipcRenderer.sendSync = function () {
var args;
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
return JSON.parse(ipc.sendSync('ipc-message-sync', slice.call(args)));
};
ipcRenderer.sendSync = function () {
var args
args = 1 <= arguments.length ? slice.call(arguments, 0) : []
return JSON.parse(ipc.sendSync('ipc-message-sync', slice.call(args)))
}

ipcRenderer.sendToHost = function () {
var args;
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
return ipc.send('ipc-message-host', slice.call(args));
};
ipcRenderer.sendToHost = function () {
var args
args = 1 <= arguments.length ? slice.call(arguments, 0) : []
return ipc.send('ipc-message-host', slice.call(args))
}

ipcRenderer.emit = function () {
arguments[1].sender = ipcRenderer;
return EventEmitter.prototype.emit.apply(ipcRenderer, arguments);
};
ipcRenderer.emit = function () {
arguments[1].sender = ipcRenderer
return EventEmitter.prototype.emit.apply(ipcRenderer, arguments)
}
atom.v8.setHiddenValue('ipc', ipcRenderer)
}

exports.on = ipcRenderer.on.bind(ipcRenderer);
exports.once = ipcRenderer.once.bind(ipcRenderer);
Expand Down
119 changes: 77 additions & 42 deletions atom/common/javascript_bindings.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,59 +17,89 @@
#include "third_party/WebKit/public/web/WebDocument.h"

namespace {
content::RenderView* GetCurrentRenderView() {
blink::WebLocalFrame* frame =
blink::WebLocalFrame::frameForCurrentContext();
if (!frame)
return NULL;

blink::WebView* view = frame->view();
if (!view)
return NULL; // can happen during closing.
content::RenderView* GetCurrentRenderView() {
blink::WebLocalFrame* frame =
blink::WebLocalFrame::frameForCurrentContext();
if (!frame)
return NULL;

return content::RenderView::FromWebView(view);
}
blink::WebView* view = frame->view();
if (!view)
return NULL; // can happen during closing.

void IPCSend(mate::Arguments* args,
const base::string16& channel,
const base::ListValue& arguments) {
content::RenderView* render_view = GetCurrentRenderView();
if (render_view == NULL)
return;
return content::RenderView::FromWebView(view);
}

bool success = render_view->Send(new AtomViewHostMsg_Message(
render_view->GetRoutingID(), channel, arguments));
v8::Local<v8::Value> GetHiddenValue(v8::Isolate* isolate,
v8::Local<v8::String> key) {
content::RenderView* render_view = GetCurrentRenderView();
v8::Local<v8::Context> context =
render_view->GetWebView()->mainFrame()->mainWorldScriptContext();
v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
v8::Local<v8::Value> value;
v8::Local<v8::Object> object = context->Global();
v8::Maybe<bool> result = object->HasPrivate(context, privateKey);
if (!(result.IsJust() && result.FromJust()))
return v8::Local<v8::Value>();
if (object->GetPrivate(context, privateKey).ToLocal(&value))
return value;
return v8::Local<v8::Value>();
}

if (!success)
args->ThrowError("Unable to send AtomViewHostMsg_Message");
}
void SetHiddenValue(v8::Isolate* isolate,
v8::Local<v8::String> key,
v8::Local<v8::Value> value) {
if (value.IsEmpty())
return;
content::RenderView* render_view = GetCurrentRenderView();
v8::Local<v8::Context> context =
render_view->GetWebView()->mainFrame()->mainWorldScriptContext();
v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
context->Global()->SetPrivate(context, privateKey, value);
}

base::string16 IPCSendSync(mate::Arguments* args,
const base::string16& channel,
const base::ListValue& arguments) {
base::string16 json;
void IPCSend(mate::Arguments* args,
const base::string16& channel,
const base::ListValue& arguments) {
content::RenderView* render_view = GetCurrentRenderView();
if (render_view == NULL)
return;

content::RenderView* render_view = GetCurrentRenderView();
if (render_view == NULL)
return json;
bool success = render_view->Send(new AtomViewHostMsg_Message(
render_view->GetRoutingID(), channel, arguments));

IPC::SyncMessage* message = new AtomViewHostMsg_Message_Sync(
render_view->GetRoutingID(), channel, arguments, &json);
bool success = render_view->Send(message);
if (!success)
args->ThrowError("Unable to send AtomViewHostMsg_Message");
}

if (!success)
args->ThrowError("Unable to send AtomViewHostMsg_Message_Sync");
base::string16 IPCSendSync(mate::Arguments* args,
const base::string16& channel,
const base::ListValue& arguments) {
base::string16 json;

content::RenderView* render_view = GetCurrentRenderView();
if (render_view == NULL)
return json;
}

std::vector<v8::Local<v8::Value>> ListValueToVector(v8::Isolate* isolate,
const base::ListValue& list) {
v8::Local<v8::Value> array = mate::ConvertToV8(isolate, list);
std::vector<v8::Local<v8::Value>> result;
mate::ConvertFromV8(isolate, array, &result);
return result;
}

IPC::SyncMessage* message = new AtomViewHostMsg_Message_Sync(
render_view->GetRoutingID(), channel, arguments, &json);
bool success = render_view->Send(message);

if (!success)
args->ThrowError("Unable to send AtomViewHostMsg_Message_Sync");

return json;
}

std::vector<v8::Local<v8::Value>> ListValueToVector(v8::Isolate* isolate,
const base::ListValue& list) {
v8::Local<v8::Value> array = mate::ConvertToV8(isolate, list);
std::vector<v8::Local<v8::Value>> result;
mate::ConvertFromV8(isolate, array, &result);
return result;
}

} // namespace

namespace atom {
Expand Down Expand Up @@ -103,6 +133,11 @@ void JavascriptBindings::GetBinding(
ipc.SetMethod("sendSync", &IPCSendSync);
binding.Set("ipc", ipc.GetHandle());

mate::Dictionary v8(isolate, v8::Object::New(isolate));
v8.SetMethod("getHiddenValue", &GetHiddenValue);
v8.SetMethod("setHiddenValue", &SetHiddenValue);
binding.Set("v8", v8.GetHandle());

mate::Dictionary content_settings(isolate, v8::Object::New(isolate));
content_settings.SetMethod("get",
base::Bind(&ContentSettingsManager::GetSetting,
Expand Down

1 comment on commit faa1d5a

@bbondy
Copy link
Member

@bbondy bbondy commented on faa1d5a Aug 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Please sign in to comment.