Merge pull request #14715 from brave/riastradh-tor-blocktorlessonion

Block loading .onion sites in non-Tor tabs.
brave · Jul 13, 2018 · 518ce29 · 518ce29
2 parents 02c499e + 6efebe7
commit 518ce29
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
@@ -238,6 +238,7 @@ submit=Submit
 tabsSuggestionTitle=Tabs
 topSiteSuggestionTitle=Top Site
 urlBlockedInTor=For your privacy, Brave blocks this URL from loading in a private tab when Tor is enabled.
+urlBlockedOutsideTor=For your privacy, Brave blocks this URL from loading in a tab without Tor.
 urlWarningOk=Ok
 torConnectionError=Unable to connect to the Tor network
 torConnectionErrorInfo=Brave could not make a connection to the Tor network. Disable Tor to continue private browsing without Tor protection.

diff --git a/app/filtering.js b/app/filtering.js
@@ -130,6 +130,15 @@ function registerForBeforeRequest (session, partition) {
         onBlockedInTor(details, muonCb)
         return
       }
+    } else {
+      const hostname = urlParse(details.url).hostname
+      // US-ASCII only in `.onion', so no need for locale-dependent
+      // case-insensitive comparisons.
+      if (typeof hostname === 'string' &&
+          hostname.toLowerCase().endsWith('.onion')) {
+        onBlockedOutsideTor(details, muonCb)
+        return
+      }
     }
 
     if (process.env.NODE_ENV === 'development') {
@@ -393,11 +402,11 @@ function registerForBeforeSendHeaders (session, partition) {
   })
 }
 
-function onBlockedInTor (details, muonCb) {
+function onBlocked (reasonKey, details, muonCb) {
   const cb = () => muonCb({cancel: true})
   if (details.tabId && details.resourceType === 'mainFrame') {
     tabMessageBox.show(details.tabId, {
-      message: `${locale.translation('urlBlockedInTor')}`,
+      message: `${locale.translation(reasonKey)}`,
       title: 'Brave',
       buttons: [locale.translation('urlWarningOk')]
     }, cb)
@@ -406,6 +415,14 @@ function onBlockedInTor (details, muonCb) {
   }
 }
 
+function onBlockedInTor (details, muonCb) {
+  onBlocked('urlBlockedInTor', details, muonCb)
+}
+
+function onBlockedOutsideTor (details, muonCb) {
+  onBlocked('urlBlockedOutsideTor', details, muonCb)
+}
+
 /**
  * Register for notifications for webRequest.onHeadersReceived for a particular
  * session.

diff --git a/app/locale.js b/app/locale.js
@@ -270,6 +270,7 @@ var rendererIdentifiers = function () {
     'noDownloads',
     'torrentDesc',
     'urlBlockedInTor',
+    'urlBlockedOutsideTor',
     'urlWarningOk',
     'multiSelectionBookmarks',
     // Caption buttons in titlebar (min/max/close - Windows only)