bind tor new circuit to hard refresh in tor tabs

fix #13925
brave · Apr 30, 2018 · d43a263 · d43a263
1 parent 58b859d
commit d43a263
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/filtering.js b/app/filtering.js
@@ -9,6 +9,7 @@ const electron = require('electron')
 const session = electron.session
 const BrowserWindow = electron.BrowserWindow
 const webContents = electron.webContents
+const webContentsCache = require('./browser/webContentsCache')
 const appActions = require('../js/actions/appActions')
 const appConfig = require('../js/constants/appConfig')
 const hostContentSettings = require('./browser/contentSettings/hostContentSettings')
@@ -662,8 +663,10 @@ module.exports.setTorNewIdentity = (url, tabId) => {
     return
   }
   ses.setTorNewIdentity(url, () => {
-    const tab = webContents.fromTabID(tabId)
-    tab.reload()
+    const tab = webContentsCache.getWebContents(tabId)
+    if (tab && !tab.isDestroyed()) {
+      tab.reload(true)
+    }
   })
 }
 

diff --git a/app/renderer/components/frame/frame.js b/app/renderer/components/frame/frame.js
@@ -300,7 +300,12 @@ class Frame extends React.Component {
         }
         break
       case 'clean-reload':
-        tabActions.reload(this.props.tabId, true)
+        if (frameStateUtil.isTor(this.frame)) {
+          // Set a new Tor circuit
+          appActions.setTorNewIdentity(this.props.tabId, this.props.location)
+        } else {
+          tabActions.reload(this.props.tabId, true)
+        }
         break
       case 'zoom-in':
         this.zoomIn()