Fixes: #14374 Show warning if torrent files are opened in tor private…

… tabs
brave · Jun 25, 2018 · 0e8c70c · 0e8c70c
1 parent 1c6778f
commit 0e8c70c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/app/browser/webtorrent.js b/app/browser/webtorrent.js
@@ -145,5 +145,7 @@ function getHeader (headers, headerName) {
 
 module.exports = {
   init,
+  isTorrentFile,
+  isMagnetURL,
   resourceName: 'webtorrent'
 }
diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
@@ -237,6 +237,8 @@ streetAddress=Street Address
 submit=Submit
 tabsSuggestionTitle=Tabs
 topSiteSuggestionTitle=Top Site
+torrentBlockedInTor=For your privacy, torrents are blocked in private tabs when Tor is enabled.
+torrentWarningOk=Ok
 turnOffNotifications=Turn off notifications
 unknownError=Oops, something went wrong.
 unmuteTab=Unmute tab

diff --git a/app/filtering.js b/app/filtering.js
@@ -28,6 +28,7 @@ const ipcMain = electron.ipcMain
 const app = electron.app
 const path = require('path')
 const getOrigin = require('../js/lib/urlutil').getOrigin
+const {isTorrentFile, isMagnetURL} = require('./browser/webtorrent')
 const {adBlockResourceName} = require('./adBlock')
 const {updateElectronDownloadItem} = require('./browser/electronDownloadItem')
 const {fullscreenOption} = require('./common/constants/settingsEnums')
@@ -42,6 +43,7 @@ const tor = require('./tor')
 
 let appStore = null
 
+const tabMessageBox = require('./browser/tabMessageBox')
 const beforeSendHeadersFilteringFns = []
 const beforeRequestFilteringFns = []
 const beforeRedirectFilteringFns = []
@@ -119,6 +121,11 @@ function registerForBeforeRequest (session, partition) {
       return
     }
 
+    if ((isMagnetURL(details)) && partition === appConfig.tor.partition) {
+      showTorrentBlockedInTorWarning(details)
+      return
+    }
+
     const firstPartyUrl = module.exports.getMainFrameUrl(details)
     const url = details.url
     // this can happen if the tab is closed and the webContents is no longer available
@@ -350,6 +357,16 @@ function registerForBeforeSendHeaders (session, partition) {
   })
 }
 
+function showTorrentBlockedInTorWarning (details) {
+  if (details.tabId) {
+    tabMessageBox.show(details.tabId, {
+      message: `${locale.translation('torrentBlockedInTor')}`,
+      title: 'Brave',
+      buttons: [locale.translation('torrentWarningOk')]
+    })
+  }
+}
+
 /**
  * Register for notifications for webRequest.onHeadersReceived for a particular
  * session.
@@ -363,6 +380,10 @@ function registerForHeadersReceived (session, partition) {
       muonCb({})
       return
     }
+    if ((isTorrentFile(details)) && partition === appConfig.tor.partition) {
+      showTorrentBlockedInTorWarning(details)
+      return
+    }
     const firstPartyUrl = module.exports.getMainFrameUrl(details)
     // this can happen if the tab is closed and the webContents is no longer available
     if (!firstPartyUrl) {

diff --git a/app/locale.js b/app/locale.js
@@ -257,6 +257,8 @@ var rendererIdentifiers = function () {
     'downloadPaused',
     'noDownloads',
     'torrentDesc',
+    'torrentBlockedInTor',
+    'torrentWarningOk',
     'multiSelectionBookmarks',
     // Caption buttons in titlebar (min/max/close - Windows only)
     'windowCaptionButtonMinimize',