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

Prevent the opening of a new Tor tab on every renderer initiated navigation. #20125

Merged
merged 5 commits into from
Sep 15, 2023

Conversation

boocmp
Copy link
Contributor

@boocmp boocmp commented Sep 12, 2023

Resolves brave/brave-browser#32706

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • 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 wiki
    • npm run lint, npm run presubmit wiki, 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:

@boocmp boocmp requested review from iefremov and a team as code owners September 12, 2023 11:46
@github-actions github-actions bot added the CI/run-network-audit Run network-audit label Sep 12, 2023
@boocmp boocmp requested a review from diracdeltas September 12, 2023 11:46
Copy link
Member

@kdenhartog kdenhartog left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for adding browser tests in as well to prevent a regression here. I've dynamically tested and confirmed this matches the behavior of non .onion domains (opens the last redirect).

@boocmp boocmp requested a review from darkdh September 12, 2023 14:25
@diracdeltas
Copy link
Member

looks like some related tests are failing: https://ci.brave.com/job/pr-brave-browser-issues-32706-linux-x64/5/testReport/

friend class WebContentsUserData;

// Used only for pointer comparasion.
const raw_ptr<content::WebContents, DanglingUntriaged>
Copy link
Member

Choose a reason for hiding this comment

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

do you really need to have Dangling trait here? It should be safe to compare even a dangling pointer. see UnsafelyUnwrapPtrForComparison.

Profile::FromBrowserContext(web_contents->GetBrowserContext());
TorProfileManager::SwitchToTorProfile(profile,
base::BindRepeating(&OnTorProfileCreated, std::move(onion_location)));
content::WebContents* context,
Copy link
Member

Choose a reason for hiding this comment

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

context intentional? why not web_contents?

@@ -86,7 +89,8 @@ OnionLocationNavigationThrottle::WillProcessResponse() {
}
// If user prefers opening it automatically
if (pref_service_->GetBoolean(prefs::kAutoOnionRedirect)) {
delegate_->OpenInTorWindow(navigation_handle()->GetWebContents(), url);
delegate_->OpenInTorWindow(navigation_handle()->GetWebContents(), url,
false);
Copy link
Member

@goodov goodov Sep 13, 2023

Choose a reason for hiding this comment

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

@darkdh @fmarier why do we keep loading the page via https here? Spec says:

a) If the user has enabled automatic Onion-Location redirects
      the header is equivalent to a redirect with a Refresh header and a
      timeout of 0 seconds [1]. As an example: the header in 2.1 would be
      treated like a `Refresh: 0;URL='http://vwc43ag5jyewlfgf.onion'` header.

which means the https loading should stop. In our case we cannot reuse the same tab for .onion URL by adding Refresh header, but I think we should stop the loading here.

I think we can technically do a redirect via throttler(?) which should just close/stop the current tab and open Tor window with the .onion URL.

Copy link
Member

Choose a reason for hiding this comment

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

I must missed that when implementing it.
Will content::NavigationThrottle::BLOCK_RESPONSE suffice?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it will, I can easily add this change.

@boocmp boocmp enabled auto-merge (squash) September 15, 2023 11:55
@boocmp boocmp merged commit 1d256fc into master Sep 15, 2023
@boocmp boocmp deleted the issues/32706 branch September 15, 2023 16:18
@github-actions github-actions bot added this to the 1.60.x - Nightly milestone Sep 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[hackerone]: Redirect with Tor tabs
6 participants