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.

Sign up for GitHub

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

Fix infinite OpenInTorWindow looping when auto redirect through navigation throttle. #7713

Merged
merged 1 commit into from
Jan 27, 2021
Merged

Fix infinite OpenInTorWindow looping when auto redirect through navigation throttle. #7713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions browser/tor/onion_location_navigation_throttle_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,23 @@ IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
ui_test_utils::NavigateToURL(browser(), GURL("https://brave.com"));
EXPECT_EQ(1U, browser_list->size());
ASSERT_FALSE(browser_list->get(0)->profile()->IsTor());
ASSERT_EQ(browser(), browser_list->get(0));

content::WindowedNotificationObserver tor_browser_creation_observer(
chrome::NOTIFICATION_BROWSER_OPENED,
content::NotificationService::AllSources());
ui_test_utils::NavigateToURL(browser(), GURL(kTestOnionURL));
tor_browser_creation_observer.Wait();
EXPECT_EQ(2U, browser_list->size());
ASSERT_TRUE(browser_list->get(1)->profile()->IsTor());
Browser* tor_browser = browser_list->get(1);
ASSERT_TRUE(tor_browser->profile()->IsTor());
content::WebContents* web_contents =
browser_list->get(1)->tab_strip_model()->GetActiveWebContents();
tor_browser->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(web_contents->GetURL(), GURL(kTestOnionURL));
// We don't close the original tab
EXPECT_EQ(browser()->tab_strip_model()->count(), 1);
// No new tab in Tor window
EXPECT_EQ(tor_browser->tab_strip_model()->count(), 1);
}

IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
Expand Down Expand Up @@ -145,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
GURL url = test_server()->GetURL("/onion");
ui_test_utils::NavigateToURL(browser(), url);
tor_browser_creation_observer.Wait();
// Last tab will not be closed
// We don't close the original tab
EXPECT_EQ(browser()->tab_strip_model()->count(), 1);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
Expand All @@ -161,17 +167,19 @@ IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
web_contents = tor_browser->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(web_contents->GetURL(), GURL(kTestOnionURL));

// Open a new tab
// Open a new tab and navigate to the url again
NavigateParams params(
NavigateParams(browser(), url, ui::PAGE_TRANSITION_TYPED));
params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
ui_test_utils::NavigateToURL(&params);

EXPECT_EQ(browser()->tab_strip_model()->count(), 1);
// We stll don't close the original tab
EXPECT_EQ(browser()->tab_strip_model()->count(), 2);

EXPECT_EQ(2U, browser_list->size());
web_contents = tor_browser->tab_strip_model()->GetWebContentsAt(2);
EXPECT_EQ(tor_browser->tab_strip_model()->count(), 3);
// No new tab in Tor window and unique one tab per site
EXPECT_EQ(tor_browser->tab_strip_model()->count(), 1);
web_contents = tor_browser->tab_strip_model()->GetWebContentsAt(0);
EXPECT_EQ(web_contents->GetURL(), GURL(kTestOnionURL));
}

Expand Down
9 changes: 2 additions & 7 deletions browser/tor/onion_location_navigation_throttle_delegate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ void OnTorProfileCreated(GURL onion_location,
Profile::CreateStatus status) {
if (status != Profile::CreateStatus::CREATE_STATUS_INITIALIZED)
return;
Browser* browser = chrome::FindTabbedBrowser(profile, true);
Browser* browser = chrome::FindTabbedBrowser(profile, false);
if (!browser)
return;
content::OpenURLParams open_tor(onion_location, content::Referrer(),
WindowOpenDisposition::NEW_FOREGROUND_TAB,
WindowOpenDisposition::SWITCH_TO_TAB,
ui::PAGE_TRANSITION_TYPED, false);
browser->OpenURL(open_tor);
}
Expand All @@ -46,11 +46,6 @@ void OnionLocationNavigationThrottleDelegate::OpenInTorWindow(
Profile::FromBrowserContext(web_contents->GetBrowserContext());
TorProfileManager::SwitchToTorProfile(profile,
base::BindRepeating(&OnTorProfileCreated, std::move(onion_location)));

// We do not close last tab of the window
Browser* browser = chrome::FindBrowserWithProfile(profile);
if (browser && browser->tab_strip_model()->count() > 1)
web_contents->ClosePage();
}

} // namespace tor
1 change: 0 additions & 1 deletion components/tor/onion_location_navigation_throttle.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ OnionLocationNavigationThrottle::WillStartRequest() {
pref_service_->GetBoolean(prefs::kAutoOnionRedirect)) {
delegate_->OpenInTorWindow(navigation_handle()->GetWebContents(),
std::move(url));
return content::NavigationThrottle::CANCEL_AND_IGNORE;
}
}
return content::NavigationThrottle::PROCEED;
Expand Down