Tor binary path will be passed from browser-laptop

brave · Mar 16, 2018 · f14bc9c · f14bc9c
1 parent ffcf06f
commit f14bc9c
Show file tree

Hide file tree

Showing 3 changed files with 155 additions and 71 deletions.
diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -40,6 +40,7 @@ const bookmarkOrderCache = require('../common/cache/bookmarkOrderCache')
 const ledgerState = require('../common/state/ledgerState')
 const {getWindow} = require('./windows')
 const activeTabHistory = require('./activeTabHistory')
+const path = require('path')
 
 let adBlockRegions
 let currentPartitionNumber = 0
@@ -1016,7 +1017,11 @@ const api = {
           createProperties.isolated_storage = true
           createProperties.parent_partition = ''
           createProperties.tor_proxy = 'socks5://127.0.0.1:9050'
-          createProperties.tor_path = getExtensionsPath('tor') + "/tor"
+          if (process.platform === 'win32') {
+            createProperties.tor_path = path.join(getExtensionsPath('bin'), 'tor.exe').quote()
+          } else {
+            createProperties.tor_path = path.join(getExtensionsPath('bin'), 'tor')
+          }
         }
       }
 

diff --git a/app/filtering.js b/app/filtering.js
@@ -692,7 +692,11 @@ const initPartition = (partition) => {
     options.isolated_storage = true
     options.parent_partition = ''
     options.tor_proxy = 'socks5://127.0.0.1:9050'
-    options.tor_path = getExtensionsPath('tor') + "/tor"
+    if (process.platform === 'win32') {
+      options.tor_path = path.join(getExtensionsPath('bin'), 'tor.exe').quote()
+    } else {
+      options.tor_path = path.join(getExtensionsPath('bin'), 'tor')
+    }
   }
 
   let ses = session.fromPartition(partition, options)