Merge pull request #14529 from brave/fix/tor-rent

fix tor-related webtorrent issues

Author: bsclifton

app/extensions.js

@@ -289,7 +289,7 @@ let generateTorrentManifest = () => {
       48: 'img/webtorrent-48.png',
       16: 'img/webtorrent-16.png'
     },
-    incognito: 'not_allowed',
+    incognito: 'split',
     key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyWl+wMvL0wZX3JUs7GeZAvxMP+LWEh2bwMV1HyuBra/lGZIq3Fmh0+AFnvFPXz1NpQkbLS3QWyqhdIn/lepGwuc2ma0glPzzmieqwctUurMGSGManApGO1MkcbSPhb+R1mx8tMam5+wbme4WoW37PI3oATgOs2NvHYuP60qol3U7b/zB3IWuqtwtqKe2Q1xY17btvPuz148ygWWIHneedt0jwfr6Zp+CSLARB9Heq/jqGXV4dPSVZ5ebBHLQ452iZkHxS6fm4Z+IxjKdYs3HNj/s8xbfEZ2ydnArGdJ0lpSK9jkDGYyUBugq5Qp3FH6zV89WqBvoV1dqUmL9gxbHsQIDAQAB'
   }
 }

app/filtering.js

@@ -122,7 +122,7 @@ function registerForBeforeRequest (session, partition) {
     }
 
     if ((isMagnetURL(details)) && partition === appConfig.tor.partition) {
-      showTorrentBlockedInTorWarning(details)
+      showTorrentBlockedInTorWarning(details, muonCb)
       return
     }
 
@@ -357,13 +357,16 @@ function registerForBeforeSendHeaders (session, partition) {
   })
 }
 
-function showTorrentBlockedInTorWarning (details) {
+function showTorrentBlockedInTorWarning (details, muonCb) {
+  const cb = () => muonCb({cancel: true})
   if (details.tabId) {
     tabMessageBox.show(details.tabId, {
       message: `${locale.translation('torrentBlockedInTor')}`,
       title: 'Brave',
       buttons: [locale.translation('torrentWarningOk')]
-    })
+    }, cb)
+  } else {
+    cb()
   }
 }
 
@@ -381,7 +384,7 @@ function registerForHeadersReceived (session, partition) {
       return
     }
     if ((isTorrentFile(details)) && partition === appConfig.tor.partition) {
-      showTorrentBlockedInTorWarning(details)
+      showTorrentBlockedInTorWarning(details, muonCb)
       return
     }
     const firstPartyUrl = module.exports.getMainFrameUrl(details)
@@ -670,7 +673,10 @@ function registerForDownloadListener (session) {
   })
 }
 
-function registerForMagnetHandler (session) {
+function registerForMagnetHandler (session, partition) {
+  if (partition === appConfig.tor.partition) {
+    return
+  }
   const webtorrentUrl = appUrlUtil.getTorrentExtUrl('webtorrent.html')
   try {
     if (getSetting(settings.TORRENT_VIEWER_ENABLED)) {