Set the tor socks port and data directory. #13641

riastradh-brave · 2018-03-28T20:14:20Z

Set the tor socks port and data directory for muon to use. For use with brave/muon#553 once that is merged or obviated by equivalent changes.

darkdh · 2018-03-28T20:36:05Z

app/filtering.js

@@ -692,9 +694,35 @@ const initPartition = (partition) => {
    options.parent_partition = ''
  }
  if (isTorPartition) {
+    // TODO(riastradh): Duplicate logic in app/browser/tabs.js.


it is actually a bug @diracdeltas mentioned in brave/muon#473 (comment)

@riastradh-brave can you split this out into a separate module so it's not in here twice? for instance you could add it as an exported method in app/channel.js

diracdeltas · 2018-03-28T21:54:55Z

app/browser/tabs.js

+          createProperties.tor_proxy = `socks5://127.0.0.1:${portno}`
+          const etcDir = getExtensionsPath('etc')
+          try {
+            fs.mkdirSync(path.join(etcDir, 'tor'), 0o0700)


we shouldn't call synchronous fs methods for performance reasons. can you just make this directory and check it into git? i would prefer it be app/extensions/brave/etc/tor since Tor is part of the Brave "extension" mostly

diracdeltas · 2018-03-28T22:00:20Z

app/browser/tabs.js

+          } catch (e) {
+            // TODO(riastradh): Report errors other than EEXIST.
+          }
+          createProperties.tor_data_dir = path.join(etcDir, 'tor', 'data')


what is actually going in this directory?

diracdeltas · 2018-03-29T02:19:21Z

app/browser/tabs.js

+          createProperties.tor_proxy = `socks5://127.0.0.1:${portno}`
+          const userDataDir = app.getPath('userData')
+          try {
+            fs.mkdirSync(path.join(userDataDir, 'tor'), 0o0700)


you should make this directory on startup if it doesn't exist, instead of every time that a tor tab is created, for performance reasons. see app/sessionStore.js

diracdeltas

de-duplicate code
mkdir on startup

darkdh · 2018-03-29T18:51:48Z

app/browser/tabs.js

+          } catch (e) {
+            // TODO(riastradh): Report errors other than EEXIST.
+          }
+          createProperties.tor_data_dir = path.join(userDataDir, 'tor', 'data')


This can be done in muon so we can remove it here

darkdh · 2018-03-29T18:52:03Z

app/filtering.js

+    } catch (e) {
+      // TODO(riastradh): Report errors other than EEXIST.
+    }
+    options.tor_data_dir = path.join(userDataDir, 'tor', 'data')


Omit vestigial debug messages while here.

riastradh-brave · 2018-04-12T03:00:15Z

mkdir and user data lookup will be done in muon in brave/muon#473 now, so those parts of the commit have been changed. Now it's just setting the socks proxy url with a port number dependent on the channel.

diracdeltas · 2018-04-12T18:14:55Z

app/browser/tabs.js

          createProperties.isolated_storage = true
          createProperties.parent_partition = ''
-          createProperties.tor_proxy = 'socks5://127.0.0.1:9050'
+          createProperties.tor_proxy = getTorSocksProxy()


[minor] this function gets called every time a new tab is created. you could declare const TOR_SOCKS_PROXY = getTorSocksProxy() at the beginning of this file and just use the constant here since it won't change for a given build of Brave

Support isolated_storage and tor_proxy requires brave/muon#473 Use Session::IsOffTheRecord to detect private tab requires brave/muon@edad1b2 Set Tor new identify fix #12997 requires brave/muon@7e052dd Session::IsOffTheRecord for app/filtering Refresh page after getting new identity requires brave/muon@c3d6769 implement switch Tor Private Tabs in about:newtab set isTor depending on tor private tab setting and tor availability close/re-open private tab when tor switch is toggled Recreate tor private tab at the same index it was previously at always enable new identity button for now Disable search suggestions in private mode for Tor Fix #13064 set ddg as default search engine in tor private tabs fix #13212 Disable webtorrent in tor private mode fix #13063 load favicons in Tor tabs as data: URLs fix #13065 Omit unlocked icon for HTTP onion sites Fix #12990 also fix unittests Test Plan: 1. go to http://3expgpdnrrzezf7r.onion/ in a private tab 2. no icon should be in the urlbar 3. go to https://3g2upl4pq6kufc4m.onion/ 4. you should see a lock icon disable webrtc in tor mode fix #13397 add note to shields panel about breakage in tor mode Tor binary path will be passed from browser-laptop (#13455) Disable widevine notification on Tor tabs needed for #13396 Test Plan: 1. go to https://shaka-player-demo.appspot.com in a tor private tab 2. you should not see a widevine notification disable plugins in Tor private tabs Workaround browser-context-created not being emitted for tor tabs Disable flash click to play on tor tabs TODO: figure out a way to disable widevine on a per-tab basis Test Plan: 1. ensure flash is installed and enabled in preferences 2. go to https://get.adobe.com/flashplayer/about/ 3. make sure there is no popup asking you to run flash 4. right click on the flash click-to-play element (looks like a puzzle piece) on the page. no context menu should appear. deny geolocation in tor mode fix #13447 implement new tor tabs mockup fix #12922 implement new Tor New Identity UX fix #13658 Test Plan: 1. open new private tab 2. go to check.torproject.org and open shields 3. click 'new circuit' button in shields 4. it should reload the page and show a new IP 5. open shields again, click the info circle next to 'new circuit' 5. it should open a FAQ page Bundling tor with Brave Set the tor socks port and data directory. (#13641) Pass the port and data directory down for tor to use depending on channel bind tor new circuit to hard refresh in tor tabs fix #13925 upgrade to muon 6.1.0 for tor API support

darkdh requested review from darkdh and diracdeltas March 28, 2018 20:34

darkdh reviewed Mar 28, 2018

View reviewed changes

diracdeltas reviewed Mar 28, 2018

View reviewed changes

diracdeltas reviewed Mar 29, 2018

View reviewed changes

diracdeltas suggested changes Mar 29, 2018

View reviewed changes

darkdh assigned riastradh-brave Mar 29, 2018

darkdh suggested changes Mar 29, 2018

View reviewed changes

darkdh force-pushed the feature/tor branch from 1af2286 to e4d195c Compare April 3, 2018 02:03

riastradh-brave added 5 commits April 12, 2018 02:50

Pass the port and data directory down for tor to use.

9ceb23c

Use a path under ~/.config/brave &c. as intended.

34af164

Omit vestigial debug messages while here.

Deduplicate Tor socks port selection logic.

1f63987

Remove tor_data_dir setting; handled by muon now.

674e841

Omit needless mkdir(~/.config/brave/tor): muon handles this now.

08cebf8

riastradh-brave force-pushed the riastradh-tor-port branch from 0b42582 to 08cebf8 Compare April 12, 2018 02:56

diracdeltas reviewed Apr 12, 2018

View reviewed changes

diracdeltas approved these changes Apr 12, 2018

View reviewed changes

diracdeltas merged commit be46def into brave:feature/tor Apr 12, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set the tor socks port and data directory. #13641

Set the tor socks port and data directory. #13641

riastradh-brave commented Mar 28, 2018

darkdh Mar 28, 2018

diracdeltas Mar 28, 2018

diracdeltas Mar 28, 2018

diracdeltas Mar 28, 2018

diracdeltas Mar 29, 2018

diracdeltas left a comment

darkdh Mar 29, 2018

darkdh Mar 29, 2018

riastradh-brave commented Apr 12, 2018

diracdeltas Apr 12, 2018

Set the tor socks port and data directory. #13641

Set the tor socks port and data directory. #13641

Conversation

riastradh-brave commented Mar 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

diracdeltas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

riastradh-brave commented Apr 12, 2018

Choose a reason for hiding this comment