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

Adding enableMixedSandbox api

Browse source
This commit is contained in:
Hari Krishna Reddy Juturu 2017-06-26 14:13:41 -07:00
parent 0eaddd1565
commit 74196b96a1
3 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
atom/browser/api/atom_api_app.cc
View file

@ -1028,6 +1028,30 @@ v8::Local<v8::Value> App::GetGPUFeatureStatus(v8::Isolate* isolate) {
status ? *status : base::DictionaryValue()); status ? *status : base::DictionaryValue());
} }
void App::EnableMixedSandbox(mate::Arguments* args) {
if (Browser::Get()->is_ready()) {
args->ThrowError("app.enableMixedSandbox() can only be called "
"before app is ready");
return;
}
auto command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(::switches::kNoSandbox)) {
// Remove the --no-sandbox switch
using StringType = base::CommandLine::StringType;
using StringVector = base::CommandLine::StringVector;
using CharType = base::CommandLine::CharType;
auto argv = command_line->argv();
StringVector modified_command_line;
const CharType* kNoSandboxArg = L"--no-sandbox";
for (const StringType& arg : argv) {
if (arg.compare(kNoSandboxArg) != 0)
modified_command_line.push_back(arg);
}
command_line->InitFromArgv(modified_command_line);
}
command_line->AppendSwitch(switches::kEnableMixedSandbox);
}
// static // static
mate::Handle<App> App::Create(v8::Isolate* isolate) { mate::Handle<App> App::Create(v8::Isolate* isolate) {
return mate::CreateHandle(isolate, new App(isolate)); return mate::CreateHandle(isolate, new App(isolate));
@ -1103,7 +1127,8 @@ void App::BuildPrototype(
.SetMethod("getAppMetrics", &App::GetAppMetrics) .SetMethod("getAppMetrics", &App::GetAppMetrics)
.SetMethod("getGPUFeatureStatus", &App::GetGPUFeatureStatus) .SetMethod("getGPUFeatureStatus", &App::GetGPUFeatureStatus)
// TODO(juturu): Remove in 2.0, deprecate before then with warnings // TODO(juturu): Remove in 2.0, deprecate before then with warnings
.SetMethod("getAppMemoryInfo", &App::GetAppMetrics); .SetMethod("getAppMemoryInfo", &App::GetAppMetrics)
.SetMethod("enableMixedSandbox", &App::EnableMixedSandbox);
} }
} // namespace api } // namespace api

1
atom/browser/api/atom_api_app.h
View file

@ -178,6 +178,7 @@ class App : public AtomBrowserClient::Delegate,
std::vector<mate::Dictionary> GetAppMetrics(v8::Isolate* isolate); std::vector<mate::Dictionary> GetAppMetrics(v8::Isolate* isolate);
v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate); v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate);
void EnableMixedSandbox(mate::Arguments* args);
#if defined(OS_WIN) #if defined(OS_WIN)
// Get the current Jump List settings. // Get the current Jump List settings.

6
docs/api/app.md
View file

@ -903,6 +903,12 @@ correctly.
**Note:** This will not affect `process.argv`. **Note:** This will not affect `process.argv`.
### `app.enableMixedSandbox()`
Enables mixed sandbox mode on the app.
This method can only be called before app is ready.
### `app.dock.bounce([type])` _macOS_ ### `app.dock.bounce([type])` _macOS_
* `type` String (optional) - Can be `critical` or `informational`. The default is * `type` String (optional) - Can be `critical` or `informational`. The default is