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

Guard against using protocol module too early.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-20 18:45:53 +08:00
parent e65220adb0
commit 2be1145a9e
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
browser/api/atom_api_protocol.cc
View file

@ -29,6 +29,9 @@ v8::Persistent<v8::Object> g_protocol_object;
typedef std::map<std::string, v8::Persistent<v8::Function>> HandlersMap; typedef std::map<std::string, v8::Persistent<v8::Function>> HandlersMap;
static HandlersMap g_handlers; static HandlersMap g_handlers;
static const char* kEarlyUseProtocolError = "This method can only be used"
"after the application has finished launching.";
// Emit an event for the protocol module. // Emit an event for the protocol module.
void EmitEventInUI(const std::string& event, const std::string& parameter) { void EmitEventInUI(const std::string& event, const std::string& parameter) {
v8::HandleScope scope; v8::HandleScope scope;
@ -185,6 +188,9 @@ v8::Handle<v8::Value> Protocol::RegisterProtocol(const v8::Arguments& args) {
net::URLRequest::IsHandledProtocol(scheme)) net::URLRequest::IsHandledProtocol(scheme))
return node::ThrowError("The scheme is already registered"); return node::ThrowError("The scheme is already registered");
if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
return node::ThrowError(kEarlyUseProtocolError);
// Store the handler in a map. // Store the handler in a map.
if (!args[1]->IsFunction()) if (!args[1]->IsFunction())
return node::ThrowError("Handler must be a function"); return node::ThrowError("Handler must be a function");
@ -202,6 +208,9 @@ v8::Handle<v8::Value> Protocol::RegisterProtocol(const v8::Arguments& args) {
v8::Handle<v8::Value> Protocol::UnregisterProtocol(const v8::Arguments& args) { v8::Handle<v8::Value> Protocol::UnregisterProtocol(const v8::Arguments& args) {
std::string scheme(*v8::String::Utf8Value(args[0])); std::string scheme(*v8::String::Utf8Value(args[0]));
if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
return node::ThrowError(kEarlyUseProtocolError);
// Erase the handler from map. // Erase the handler from map.
HandlersMap::iterator it(g_handlers.find(scheme)); HandlersMap::iterator it(g_handlers.find(scheme));
if (it == g_handlers.end()) if (it == g_handlers.end())
@ -230,6 +239,9 @@ v8::Handle<v8::Value> Protocol::InterceptProtocol(const v8::Arguments& args) {
if (ContainsKey(g_handlers, scheme)) if (ContainsKey(g_handlers, scheme))
return node::ThrowError("Cannot intercept custom procotols"); return node::ThrowError("Cannot intercept custom procotols");
if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
return node::ThrowError(kEarlyUseProtocolError);
// Store the handler in a map. // Store the handler in a map.
if (!args[1]->IsFunction()) if (!args[1]->IsFunction())
return node::ThrowError("Handler must be a function"); return node::ThrowError("Handler must be a function");
@ -246,6 +258,9 @@ v8::Handle<v8::Value> Protocol::InterceptProtocol(const v8::Arguments& args) {
v8::Handle<v8::Value> Protocol::UninterceptProtocol(const v8::Arguments& args) { v8::Handle<v8::Value> Protocol::UninterceptProtocol(const v8::Arguments& args) {
std::string scheme(*v8::String::Utf8Value(args[0])); std::string scheme(*v8::String::Utf8Value(args[0]));
if (AtomBrowserContext::Get()->url_request_context_getter() == NULL)
return node::ThrowError(kEarlyUseProtocolError);
// Erase the handler from map. // Erase the handler from map.
HandlersMap::iterator it(g_handlers.find(scheme)); HandlersMap::iterator it(g_handlers.find(scheme));
if (it == g_handlers.end()) if (it == g_handlers.end())