Launch tor when tor browser context created and terminated it during

context destruction
brave · Feb 16, 2018 · f2df25a · f2df25a
1 parent 75c8277
commit f2df25a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/brave/browser/brave_browser_context.cc b/brave/browser/brave_browser_context.cc
@@ -10,6 +10,7 @@
 #include "base/path_service.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/process/launch.h"
 #include "base/trace_event/trace_event.h"
 #include "brave/browser/brave_permission_manager.h"
 #include "brave/browser/net/proxy/proxy_config_service_tor.h"
@@ -179,6 +180,11 @@ BraveBrowserContext::BraveBrowserContext(
   std::string tor_proxy;
   if (options.GetString("tor_proxy", &tor_proxy)) {
     tor_proxy_ = GURL(tor_proxy);
+    if (!tor_process_.IsValid()) {
+      base::FilePath tor("/usr/local/bin/tor");
+      base::CommandLine cmdline(tor);
+      tor_process_ = base::LaunchProcess(cmdline, base::LaunchOptions());
+    }
   }
 
   if (in_memory) {
@@ -204,6 +210,10 @@ BraveBrowserContext::BraveBrowserContext(
 BraveBrowserContext::~BraveBrowserContext() {
   MaybeSendDestroyedNotification();
 
+  if (tor_process_.IsValid()) {
+    base::EnsureProcessTerminated(std::move(tor_process_));
+  }
+
   if (track_zoom_subscription_.get())
     track_zoom_subscription_.reset(nullptr);
 

diff --git a/brave/browser/brave_browser_context.h b/brave/browser/brave_browser_context.h
@@ -179,6 +179,7 @@ class BraveBrowserContext : public Profile {
   bool isolated_storage_;
   GURL tor_proxy_;
   bool in_memory_;
+  base::Process tor_process_;
 
   URLRequestContextGetterMap url_request_context_getter_map_;
 

diff --git a/chromium_src/chrome/browser/profiles/profile_manager.cc b/chromium_src/chrome/browser/profiles/profile_manager.cc
@@ -23,6 +23,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
+#include "brave/browser/brave_browser_context.h"
 #include "build/build_config.h"
 #include "atom/browser/atom_browser_context.h"
 #include "chrome/browser/browser_process.h"
@@ -82,7 +83,10 @@ void ProfileManager::OnProfileCreated(Profile* profile,
                                       bool success,
                                       bool is_new_profile) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!profile->IsOffTheRecord() &&
+  auto brave_browser_context =
+    brave::BraveBrowserContext::FromBrowserContext(profile);
+  if ((!profile->IsOffTheRecord() ||
+       brave_browser_context->IsIsolatedStorage())&&
       !GetProfileByPath(profile->GetPath())) {
     AddProfile(profile);
   }