Deduplicate Tor socks port selection logic.

brave · Mar 30, 2018 · 0b42582 · 0b42582
1 parent 562b6a2
commit 0b42582
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 38 deletions.
diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -40,7 +40,7 @@ const ledgerState = require('../common/state/ledgerState')
 const {getWindow} = require('./windows')
 const activeTabHistory = require('./activeTabHistory')
 const path = require('path')
-const {channel} = require('../channel')
+const {getTorSocksProxy} = require('../channel')
 const fs = require('fs')
 
 let adBlockRegions
@@ -1024,24 +1024,7 @@ const api = {
           // TODO(riastradh): Duplicate logic in app/filtering.js.
           createProperties.isolated_storage = true
           createProperties.parent_partition = ''
-          let portno
-          switch (channel()) {
-            case 'dev':
-            case '':
-            default:
-              portno = 9250
-              break
-            case 'beta':
-              portno = 9260
-              break
-            case 'nightly':
-              portno = 9270
-              break
-            case 'developer':
-              portno = 9280
-              break
-          }
-          createProperties.tor_proxy = `socks5://127.0.0.1:${portno}`
+          createProperties.tor_proxy = getTorSocksProxy()
           const userDataDir = app.getPath('userData')
           try {
             fs.mkdirSync(path.join(userDataDir, 'tor'), 0o0700)

diff --git a/app/channel.js b/app/channel.js
@@ -52,3 +52,34 @@ exports.getLinuxDesktopName = () => {
   }
   return desktopName
 }
+
+// getTorSocksProxy()
+//
+//      Return the socks5:// `URL' for the Tor socks proxy we will
+//      configure the tor daemon to listen on and muon to connect to,
+//      depending on which channel we're using.  This is provisional
+//      until we let the OS choose the port number as in
+//      <https://github.com/brave/browser-laptop/issues/12936>, or
+//      until we add support for local sockets for SOCKS proxies as in
+//      <https://github.com/brave/muon/issues/469>.
+//
+exports.getTorSocksProxy = () => {
+  let portno
+  switch (channel) {
+    case 'dev':
+    case '':
+    default:
+      portno = 9250
+      break
+    case 'beta':
+      portno = 9260
+      break
+    case 'nightly':
+      portno = 9270
+      break
+    case 'developer':
+      portno = 9280
+      break
+  }
+  return `socks5://127.0.0.1:${portno}`
+}
diff --git a/app/filtering.js b/app/filtering.js
@@ -35,7 +35,7 @@ const extensionState = require('./common/state/extensionState')
 const ledgerUtil = require('./common/lib/ledgerUtil')
 const {cookieExceptions, refererExceptions} = require('../js/data/siteHacks')
 const {getBraverySettingsCache, updateBraverySettingsCache} = require('./common/cache/braverySettingsCache')
-const {channel} = require('./channel')
+const {getTorSocksProxy} = require('./channel')
 const fs = require('fs')
 
 let appStore = null
@@ -697,24 +697,7 @@ const initPartition = (partition) => {
     // TODO(riastradh): Duplicate logic in app/browser/tabs.js.
     options.isolated_storage = true
     options.parent_partition = ''
-    let portno
-    switch (channel()) {
-      case 'dev':
-      case '':
-      default:
-        portno = 9250
-        break
-      case 'beta':
-        portno = 9260
-        break
-      case 'nightly':
-        portno = 9270
-        break
-      case 'developer':
-        portno = 9280
-        break
-    }
-    options.tor_proxy = `socks5://127.0.0.1:${portno}`
+    options.tor_proxy = getTorSocksProxy()
     const userDataDir = app.getPath('userData')
     try {
       fs.mkdirSync(path.join(userDataDir, 'tor'), 0o0700)