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

Block .onion requests in non-Tor window #8040

Merged
merged 1 commit into from
Feb 23, 2021
Merged

Block .onion requests in non-Tor window #8040

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
33 changes: 31 additions & 2 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 @@ -20,6 +20,7 @@
#include "components/prefs/pref_service.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/browser_test.h"
#include "content/public/test/test_navigation_observer.h"
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"

Expand Down Expand Up @@ -113,6 +114,28 @@ IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
EXPECT_TRUE(helper->onion_location().is_empty());
}

IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
OnionDomain) {
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
content::TestNavigationObserver nav_observer(web_contents);
ui_test_utils::NavigateToURL(browser(), GURL(kTestOnionURL));
nav_observer.Wait();
// Original request was blocked
EXPECT_EQ(nav_observer.last_net_error_code(), net::ERR_BLOCKED_BY_CLIENT);
tor::OnionLocationTabHelper* helper =
tor::OnionLocationTabHelper::FromWebContents(web_contents);
EXPECT_TRUE(helper->should_show_icon());
EXPECT_EQ(helper->onion_location(), GURL(kTestOnionURL));
CheckOnionLocationLabel(browser());

ui_test_utils::NavigateToURL(browser(), GURL(kTestNotOnionURL));
web_contents = browser()->tab_strip_model()->GetActiveWebContents();
helper = tor::OnionLocationTabHelper::FromWebContents(web_contents);
EXPECT_FALSE(helper->should_show_icon());
EXPECT_TRUE(helper->onion_location().is_empty());
}

IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
OnionDomain_AutoOnionRedirect) {
browser()->profile()->GetPrefs()->SetBoolean(tor::prefs::kAutoOnionRedirect,
Expand All @@ -126,14 +149,20 @@ IN_PROC_BROWSER_TEST_F(OnionLocationNavigationThrottleBrowserTest,
content::WindowedNotificationObserver tor_browser_creation_observer(
chrome::NOTIFICATION_BROWSER_OPENED,
content::NotificationService::AllSources());
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
content::TestNavigationObserver nav_observer(web_contents);
ui_test_utils::NavigateToURL(browser(), GURL(kTestOnionURL));
tor_browser_creation_observer.Wait();
nav_observer.Wait();
// Original request was blocked
EXPECT_EQ(nav_observer.last_net_error_code(), net::ERR_BLOCKED_BY_CLIENT);
EXPECT_EQ(2U, browser_list->size());
Browser* tor_browser = browser_list->get(1);
ASSERT_TRUE(tor_browser->profile()->IsTor());
content::WebContents* web_contents =
content::WebContents* tor_web_contents =
tor_browser->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(web_contents->GetURL(), GURL(kTestOnionURL));
EXPECT_EQ(tor_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
Expand Down
2 changes: 1 addition & 1 deletion browser/ui/views/location_bar/onion_location_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void OnTorProfileCreated(GURL onion_location,
if (!browser)
return;
content::OpenURLParams open_tor(onion_location, content::Referrer(),
WindowOpenDisposition::NEW_FOREGROUND_TAB,
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the leftover of #7713, "Open in Tor" and auto redirect should have same window disposition

WindowOpenDisposition::SWITCH_TO_TAB,
ui::PAGE_TRANSITION_TYPED, false);
browser->OpenURL(open_tor);
}
Expand Down
19 changes: 14 additions & 5 deletions 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,13 +94,22 @@ OnionLocationNavigationThrottle::WillProcessResponse() {

content::NavigationThrottle::ThrottleCheckResult
OnionLocationNavigationThrottle::WillStartRequest() {
// Open .onion site in Tor window
// If a user enters .onion address in non-Tor window, we block the request and
// offer "Open in Tor" button or automatically opening it in Tor window.
if (!is_tor_profile_) {
GURL url = navigation_handle()->GetURL();
if (url.SchemeIsHTTPOrHTTPS() && url.DomainIs("onion") &&
pref_service_->GetBoolean(prefs::kAutoOnionRedirect)) {
delegate_->OpenInTorWindow(navigation_handle()->GetWebContents(),
std::move(url));
if (url.SchemeIsHTTPOrHTTPS() && url.DomainIs("onion")) {
if (pref_service_->GetBoolean(prefs::kAutoOnionRedirect)) {
delegate_->OpenInTorWindow(navigation_handle()->GetWebContents(),
std::move(url));
} else {
OnionLocationTabHelper::SetOnionLocation(
navigation_handle()->GetWebContents(), url);
}
return content::NavigationThrottle::BLOCK_REQUEST;
} else {
OnionLocationTabHelper::SetOnionLocation(
navigation_handle()->GetWebContents(), GURL());
}
}
return content::NavigationThrottle::PROCEED;
Expand Down