This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
tor frontend changes for 0.23.x #14143
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diracdeltas
force-pushed
the
tor/0.23.x
branch
3 times, most recently
from
5a73788 to
4ebc04b
Compare
diracdeltas
force-pushed
the
tor/0.23.x
branch
2 times, most recently
from
580e270 to
3874337
Compare
Closed
app/filtering.js
Outdated
| } | ||
| torDaemon.onCircuitEstablished(circuitEstablished, (err) => { | ||
| if (err) { | ||
| appActions.onTorInitError(`Tor error opening a circuit: ${err}`) |
There was a problem hiding this comment.
Just FYI: An error here means not that there was a problem opening a circuit, but that there was a problem in subscribing to the circuit establishment notifications. (It's rather unlikely that this would happen.)
bsclifton
force-pushed
the
tor/0.23.x
branch
3 times, most recently
from
8ce6725 to
7e844be
Compare
bsclifton
force-pushed
the
tor/0.23.x
branch
3 times, most recently
from
997b07b to
0a2b0e1
Compare
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
to reduce delay when opening the tor private tab, in preparation for moving tor initialization to startup. Auditors: @darkdh
fix #14103 Test Plan: 1. make sure tor tabs is enabled 2. go to a link and right-click 'open in new private tab' 3. in the new private tab, go to check.torproject.org to make sure Tor is enabled 4. right click on the onion image, select 'open image in new tab' 5. in the new tab, go to check.torproect.org to make sure Tor is enabled auditors: @darkdh
Auditors: @diracdeltas, @darkdh
…rror branches for clarity. (#14554) * Use host 127.0.0.1 explicitly, instead of defaulting to localhost. May fix Brave's failure to connect to Tor on some networks, with the following symptom printed to the console: tor: control socket error: Error: getaddrinfo ENOTFOUND localhost undefined:55219 tor: control socket error: Error: getaddrinfo ENOTFOUND localhost undefined:55219 tor: control socket closed early Auditors: @diracdeltas Test Plan: Sneak into David's house and try running Brave on his home network. If he has reconfigured it, invent a time machine to revert it to the previous state where it didn't work. * Make early error message distinct. * Pass error along to control connection destruction for consistency.
Auditors: @bsclifton
fix #14567 TEST PLAN: 1. start a local http server on port 9250, ex: "python3 -m http.server 9250 --bind 127.0.0.1" 2. start brave and open tor tab 3. wait for tor error to show 4. click 'retry' button 5. it should show 'connecting...' then show the error again 6. now kill the HTTP server from step 1 7. click 'retry' again. tor should connect this time.
Previously, we would never retry polling for tor launch if we ever made the decision to open a control connection. 1. If we _haven't_ successfully opened a control connection, make sure we call this._polled() on all error paths to process a deferred file system watch notification. 2. If we have opened a control connection enough to set the `close` event handler, call this._polled() to handle a deferred poll (which, in the next tick, will either do the work it needs to do, or discover that there is already a control connection and do nothing). 3. In the `close` event handler for the control connection, poll for tor launch in case tor relaunched, and all the watch events were received and ignored, before we noticed that the control connection had closed. With this, browser-laptop will notice when the tor daemon has come back after muon executes ses.relaunchTor, without needing to call setupTor again -- which might have had unpredictable consequences of multiple simultaneous file system watchers and control connections to tor. fix #14584 Auditors: @diracdeltas Test Plan: 1. Turn off your network. 2. Launch Brave. 3. Open a private tab with Tor enabled. 4. Check that the console reports `tor: daemon listens on ...`. 5. Wait 20sec for the connection error dialogue box to pop up. 6. Hit 'retry connection'. 7. Check that the console reports `tor: daemon listens on ...` _again_.
Make polling for tor restart work. Call setupTor only once.
|
QA has completed testing of this as of 2:30 today (PST); ready for merge! 😄 |
diracdeltas
pushed a commit
that referenced
this pull request
Jun 28, 2018
tor frontend changes for 0.23.x
diracdeltas
pushed a commit
that referenced
this pull request
Jun 28, 2018
tor frontend changes for 0.23.x
bsclifton
added a commit
that referenced
this pull request
Jun 28, 2018
Merge pull request #14143 from brave/tor/0.23.x
|
merged to master with 5108937 (thanks, @diracdeltas!) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
requires brave/muon#473
requires brave/muon#470
requires brave/muon#476
fix #12235
fix #1185
fix #8224
fix #12997
fix #13064
fix #13212
fix #13065
fix #12990
fix #13396
fix #13447
fix #12922
fix #13658
fix #13925
Test plans
Basic functionality
Enable/disable
Issue 12990
Issue 13347
Plugins
piece) on the page. no context menu should appear.
Favicon leak
data:URL instead ofhttps://bing.com....Search autocomplete
WebRTC
WebTorrent
New circuit
cc @riastradh-brave @darkdh