Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed 'Request bridge' in settings. #14914

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Fixed 'Request bridge' in settings. #14914

merged 1 commit into from
Aug 31, 2022

Conversation

boocmp
Copy link
Contributor

@boocmp boocmp commented Aug 31, 2022

Resolves brave/brave-browser#25095

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

brave/brave-browser#25095 (comment) & #14914 (comment).

@boocmp boocmp requested a review from iefremov August 31, 2022 08:58
@boocmp boocmp self-assigned this Aug 31, 2022
@boocmp boocmp added this to the 1.44.x - Beta milestone Aug 31, 2022
@boocmp boocmp merged commit 2638eb4 into master Aug 31, 2022
@boocmp boocmp deleted the issues/25095 branch August 31, 2022 14:13
@boocmp boocmp restored the issues/25095 branch August 31, 2022 14:13
brave-builds pushed a commit that referenced this pull request Aug 31, 2022
@kjozwiak kjozwiak deleted the issues/25095 branch September 7, 2022 03:39
@kjozwiak
Copy link
Member

kjozwiak commented Sep 7, 2022

Reproduced the original issue on Win 11 x64 using the following build(s):

Brave | 1.45.14 Chromium: 105.0.5195.68 (Official Build) nightly (64-bit)
--- | ---
Revision | ad13e82529051bac6a0e65f455e6d7a1e5fd7938-refs/branch-heads/5195@{#903}
OS | Windows 11 Version 21H2 (Build 22000.918)

Went through the STR/Cases outlined via brave/brave-browser#25095 (comment) and reproduced the original issue as per the following:

reproducedCAPTCHA

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.45.30 Chromium: 105.0.5195.102 (Official Build) nightly (64-bit)
-- | --
Revision | 4c16f5ffcc2da70ee2600d5db77bed423ac03a5a-refs/branch-heads/5195_55@{#4}
OS | Windows 11 Version 21H2 (Build 22000.918)

Went through the STR/Cases outlined via brave/brave-browser#25095 (comment) and went through the following:

Ensured CAPTCHA is being displayed/working

CAPTCHAFixed1

Ensured you receive Tor bridge

obfs4 193.210.235.120:80 403F520B106CA8D1B45BA67BE57EDD28FFCB8608 cert=vSjq4zm3pC12s4/LZnP3tGYEi3CKPMx+Jl4zNrLKDTqEoAGpc/Au030trVifOlptFsYKWA iat-mode=1
obfs4 185.177.207.153:8443 6574D4D903FDE714F2759A3B3C31C0363A92DCDC cert=VAZd6bOJ6BKUZLLOYhMuaSPxjf+ZGAspvdQkf8C3naGk8r2b77WXWj9JF8+jLYb8l2fnUw iat-mode=0
obfs4 213.109.161.63:1790 7AC552E815FD43CEDE8E5E1768B305F61AC173B3 cert=9VwHJxHDvWBBHaLarwT5xPuCY0vVs6AWMsX4WuQ08Gj1JheSHYKZuSNiAXzZSukRlDKTDA iat-mode=0

CAPTCHAFixed2

Ensured that you can connect to Tor network when bridge running

Sep 06 23:48:52.000 [notice] Switching to guard context "bridges" (was using "default")
Sep 06 23:48:52.000 [notice] Bootstrapped 10% (conn_done): Connected to a relay
Sep 06 23:48:52.000 [notice] Bootstrapped 14% (handshake): Handshaking with a relay
Sep 06 23:48:52.000 [notice] Bootstrapped 15% (handshake_done): Handshake with a relay done
Sep 06 23:48:52.000 [notice] Bootstrapped 75% (enough_dirinfo): Loaded enough directory info to build circuits
Sep 06 23:48:52.000 [notice] Bootstrapped 90% (ap_handshake_done): Handshake finished with a relay to build circuits
Sep 06 23:48:52.000 [notice] Delaying directory fetches: No running bridges
Sep 06 23:48:53.000 [warn] Proxy Client: unable to connect OR connection (handshaking (proxy)) with 193.210.235.120:80 ID=<none> RSA_ID=403F520B106CA8D1B45BA67BE57EDD28FFCB8608 ("general SOCKS server failure")
Sep 06 23:48:53.000 [notice] new bridge descriptor 'DockerObfs4Bridge' (fresh): $7AC552E815FD43CEDE8E5E1768B305F61AC173B3~DockerObfs4Bridge [6p1k+SLPlYG6IvVIt9UQGa9FPddNGAT0RHl8mX/Y5so] at 213.109.161.63
Sep 06 23:48:53.000 [notice] Our directory information is no longer up-to-date enough to build circuits: We're missing descriptors for 1/3 of our primary entry guards (total microdescriptors: 6611/6617). That's ok. We will try to fetch missing descriptors soon.
Sep 06 23:48:53.000 [notice] new bridge descriptor 'bridge26' (fresh): $6574D4D903FDE714F2759A3B3C31C0363A92DCDC~bridge26 [lvj/hX1itXjAT5MhH1F2jagXe5453KedR3xBQuwTdgg] at 185.177.207.153
Full Tor Log
Sep 06 23:48:51.559 [notice] Tor 0.4.7.10 running on Windows 8 [or later] with Libevent 2.1.12-stable, OpenSSL 1.1.1q, Zlib 1.2.12, Liblzma N/A, Libzstd N/A and Unknown N/A as libc.
Sep 06 23:48:51.559 [notice] Tor can't help you if you use it wrong! Learn how to be safe at https://support.torproject.org/faq/staying-anonymous/
Sep 06 23:48:51.560 [notice] Read configuration file "C:\Users\kamil\AppData\Local\BraveSoftware\Brave-Browser-Nightly\User Data\cpoalefficncklhjfpglfiplenlpccdb\1.0.28\tor-torrc".
Sep 06 23:48:51.560 [notice] Read configuration file "C:\Users\kamil\AppData\Local\BraveSoftware\Brave-Browser-Nightly\User Data\cpoalefficncklhjfpglfiplenlpccdb\1.0.28\tor-torrc".
Sep 06 23:48:51.560 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.560 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.561 [notice] Wow!  I detected that you have 32 CPUs. I will not autodetect any more than 16, though.  If you want to configure more, set NumCPUs in your torrc
Sep 06 23:48:51.562 [notice] Opening Socks listener on 127.0.0.1:0
Sep 06 23:48:51.562 [notice] Socks listener listening on port 51469.
Sep 06 23:48:51.562 [notice] Opened Socks listener connection (ready) on 127.0.0.1:51469
Sep 06 23:48:51.562 [notice] Opening Control listener on 127.0.0.1:0
Sep 06 23:48:51.562 [notice] Control listener listening on port 51470.
Sep 06 23:48:51.562 [notice] Opened Control listener connection (ready) on 127.0.0.1:51470
[70796:63208:0906/234851.563:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
[70796:63208:0906/234851.563:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
[70796:63208:0906/234851.564:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
[70796:63208:0906/234851.564:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
Sep 06 23:48:51.000 [notice] Bootstrapped 0% (starting): Starting
Sep 06 23:48:51.000 [notice] Starting with guard context "default"
Sep 06 23:48:51.000 [notice] New control connection opened from 127.0.0.1.
Sep 06 23:48:51.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [notice] Bootstrapped 5% (conn): Connecting to a relay
Sep 06 23:48:51.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:52.000 [notice] Switching to guard context "bridges" (was using "default")
Sep 06 23:48:52.000 [notice] Bootstrapped 10% (conn_done): Connected to a relay
Sep 06 23:48:52.000 [notice] Bootstrapped 14% (handshake): Handshaking with a relay
Sep 06 23:48:52.000 [notice] Bootstrapped 15% (handshake_done): Handshake with a relay done
Sep 06 23:48:52.000 [notice] Bootstrapped 75% (enough_dirinfo): Loaded enough directory info to build circuits
Sep 06 23:48:52.000 [notice] Bootstrapped 90% (ap_handshake_done): Handshake finished with a relay to build circuits
Sep 06 23:48:52.000 [notice] Delaying directory fetches: No running bridges
Sep 06 23:48:53.000 [warn] Proxy Client: unable to connect OR connection (handshaking (proxy)) with 193.210.235.120:80 ID=<none> RSA_ID=403F520B106CA8D1B45BA67BE57EDD28FFCB8608 ("general SOCKS server failure")
Sep 06 23:48:53.000 [notice] new bridge descriptor 'DockerObfs4Bridge' (fresh): $7AC552E815FD43CEDE8E5E1768B305F61AC173B3~DockerObfs4Bridge [6p1k+SLPlYG6IvVIt9UQGa9FPddNGAT0RHl8mX/Y5so] at 213.109.161.63
Sep 06 23:48:53.000 [notice] Our directory information is no longer up-to-date enough to build circuits: We're missing descriptors for 1/3 of our primary entry guards (total microdescriptors: 6611/6617). That's ok. We will try to fetch missing descriptors soon.
Sep 06 23:48:53.000 [notice] new bridge descriptor 'bridge26' (fresh): $6574D4D903FDE714F2759A3B3C31C0363A92DCDC~bridge26 [lvj/hX1itXjAT5MhH1F2jagXe5453KedR3xBQuwTdgg] at 185.177.207.153
Sep 06 23:48:53.000 [notice] We now have enough directory information to build circuits.
Sep 06 23:48:54.000 [notice] Bootstrapped 95% (circuit_create): Establishing a Tor circuit
Sep 06 23:48:55.000 [notice] Bootstrapped 100% (done): Done

Ensured that you can connect to Tor network without using a bridge

Sep 06 23:50:33.000 [notice] Starting with guard context "default"
Sep 06 23:50:33.000 [notice] New control connection opened from 127.0.0.1.
Sep 06 23:50:33.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:50:33.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:50:33.000 [notice] Bootstrapped 5% (conn): Connecting to a relay
Full Tor Log
Sep 06 23:48:51.559 [notice] Tor 0.4.7.10 running on Windows 8 [or later] with Libevent 2.1.12-stable, OpenSSL 1.1.1q, Zlib 1.2.12, Liblzma N/A, Libzstd N/A and Unknown N/A as libc.
Sep 06 23:48:51.559 [notice] Tor can't help you if you use it wrong! Learn how to be safe at https://support.torproject.org/faq/staying-anonymous/
Sep 06 23:48:51.560 [notice] Read configuration file "C:\Users\kamil\AppData\Local\BraveSoftware\Brave-Browser-Nightly\User Data\cpoalefficncklhjfpglfiplenlpccdb\1.0.28\tor-torrc".
Sep 06 23:48:51.560 [notice] Read configuration file "C:\Users\kamil\AppData\Local\BraveSoftware\Brave-Browser-Nightly\User Data\cpoalefficncklhjfpglfiplenlpccdb\1.0.28\tor-torrc".
Sep 06 23:48:51.560 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.560 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.561 [notice] Wow!  I detected that you have 32 CPUs. I will not autodetect any more than 16, though.  If you want to configure more, set NumCPUs in your torrc
Sep 06 23:48:51.562 [notice] Opening Socks listener on 127.0.0.1:0
Sep 06 23:48:51.562 [notice] Socks listener listening on port 51469.
Sep 06 23:48:51.562 [notice] Opened Socks listener connection (ready) on 127.0.0.1:51469
Sep 06 23:48:51.562 [notice] Opening Control listener on 127.0.0.1:0
Sep 06 23:48:51.562 [notice] Control listener listening on port 51470.
Sep 06 23:48:51.562 [notice] Opened Control listener connection (ready) on 127.0.0.1:51470
[70796:63208:0906/234851.563:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
[70796:63208:0906/234851.563:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
[70796:63208:0906/234851.564:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
[70796:63208:0906/234851.564:INFO:tor_file_watcher.cc(183)] tor: failed to open control auth cookie
Sep 06 23:48:51.000 [notice] Bootstrapped 0% (starting): Starting
Sep 06 23:48:51.000 [notice] Starting with guard context "default"
Sep 06 23:48:51.000 [notice] New control connection opened from 127.0.0.1.
Sep 06 23:48:51.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [notice] Bootstrapped 5% (conn): Connecting to a relay
Sep 06 23:48:51.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPFile (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:51.000 [warn] Path for GeoIPv6File (<default>) is relative and will resolve to C:\Program Files\BraveSoftware\Brave-Browser-Nightly\Application\105.1.45.30\<default>. Is this what you wanted?
Sep 06 23:48:52.000 [notice] Switching to guard context "bridges" (was using "default")
Sep 06 23:48:52.000 [notice] Bootstrapped 10% (conn_done): Connected to a relay
Sep 06 23:48:52.000 [notice] Bootstrapped 14% (handshake): Handshaking with a relay
Sep 06 23:48:52.000 [notice] Bootstrapped 15% (handshake_done): Handshake with a relay done
Sep 06 23:48:52.000 [notice] Bootstrapped 75% (enough_dirinfo): Loaded enough directory info to build circuits
Sep 06 23:48:52.000 [notice] Bootstrapped 90% (ap_handshake_done): Handshake finished with a relay to build circuits
Sep 06 23:48:52.000 [notice] Delaying directory fetches: No running bridges
Sep 06 23:48:53.000 [warn] Proxy Client: unable to connect OR connection (handshaking (proxy)) with 193.210.235.120:80 ID=<none> RSA_ID=403F520B106CA8D1B45BA67BE57EDD28FFCB8608 ("general SOCKS server failure")
Sep 06 23:48:53.000 [notice] new bridge descriptor 'DockerObfs4Bridge' (fresh): $7AC552E815FD43CEDE8E5E1768B305F61AC173B3~DockerObfs4Bridge [6p1k+SLPlYG6IvVIt9UQGa9FPddNGAT0RHl8mX/Y5so] at 213.109.161.63
Sep 06 23:48:53.000 [notice] Our directory information is no longer up-to-date enough to build circuits: We're missing descriptors for 1/3 of our primary entry guards (total microdescriptors: 6611/6617). That's ok. We will try to fetch missing descriptors soon.
Sep 06 23:48:53.000 [notice] new bridge descriptor 'bridge26' (fresh): $6574D4D903FDE714F2759A3B3C31C0363A92DCDC~bridge26 [lvj/hX1itXjAT5MhH1F2jagXe5453KedR3xBQuwTdgg] at 185.177.207.153
Sep 06 23:48:53.000 [notice] We now have enough directory information to build circuits.
Sep 06 23:48:54.000 [notice] Bootstrapped 95% (circuit_create): Establishing a Tor circuit
Sep 06 23:48:55.000 [notice] Bootstrapped 100% (done): Done
</details>

@@ -82,7 +82,8 @@ constexpr const char16_t kParseBridgesScript[] =
if (!bridgeLines) return null

const bridges = bridgeLines.textContent.split('\n').filter(
(bridge) => { return bridge.trim().length != 0 })
(bridge) => { return bridge.trim().length != 0 }).
map((brigde) => { return brigde.trim(); })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boocmp s/brigde/bridge, right?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Requesting a bridge using Moat no longer works
4 participants