Only run dapp detection if metamask is not installed

Fix #11569 Auditors: @aekeus
brave · Oct 16, 2017 · edabfa0 · edabfa0
1 parent 3d2d42b
commit edabfa0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/app/extensions/brave/content/scripts/dappListener.js b/app/extensions/brave/content/scripts/dappListener.js
@@ -2,45 +2,44 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const script =
-  `
-  function __insertWeb3Installed() {
-    if (!window.alreadyInserted) {
-      const meta = document.createElement('meta')
-      meta.name = 'web3-installed'
-      document.head.appendChild(meta)
-      window.alreadyInserted = true
-    }
-  }
-  if (window.web3) {
-    if (!window.web3.currentProvider || !window.web3.currentProvider.isMetaMask) {
-      __insertWeb3Installed()
+if (chrome.contentSettings.dappDetection == 'allow') {
+  const script =
+    `
+    function __insertWeb3Installed() {
+      if (!window.alreadyInserted) {
+        const meta = document.createElement('meta')
+        meta.name = 'web3-installed'
+        document.head.appendChild(meta)
+        window.alreadyInserted = true
+      }
     }
-  } else {
-    var oldWeb3 = window.web3
-    Object.defineProperty(window, 'web3', {
-      configurable: true,
-      set: function (val) {
-        __insertWeb3Installed()
-        oldWeb3 = val
-      },
-      get: function () {
+    if (window.web3) {
+      if (!window.web3.currentProvider || !window.web3.currentProvider.isMetaMask) {
         __insertWeb3Installed()
-        return oldWeb3
       }
-    })
-  }`
+    } else {
+      var oldWeb3 = window.web3
+      Object.defineProperty(window, 'web3', {
+        configurable: true,
+        set: function (val) {
+          __insertWeb3Installed()
+          oldWeb3 = val
+        },
+        get: function () {
+          __insertWeb3Installed()
+          return oldWeb3
+        }
+      })
+    }`
 
-if (chrome.contentSettings.dappDetection == 'allow') {
   executeScript(script)
+  setTimeout(function () {
+    const isDapp = document.querySelector('meta[name="web3-installed"]')
+    if (isDapp) {
+      chrome.ipcRenderer.send('dispatch-action', JSON.stringify([{
+        actionType: 'app-dapp-available',
+        location: window.location.href
+      }]))
+    }
+  }, 3000)
 }
-
-setTimeout(function () {
-  const isDapp = document.querySelector('meta[name="web3-installed"]')
-  if (isDapp) {
-    chrome.ipcRenderer.send('dispatch-action', JSON.stringify([{
-      actionType: 'app-dapp-available',
-      location: window.location.href
-    }]))
-  }
-}, 3000)
diff --git a/js/state/contentSettings.js b/js/state/contentSettings.js
@@ -116,7 +116,7 @@ const getDefaultUserPrefContentSettings = (braveryDefaults, appSettings, appConf
       primaryPattern: '*'
     }],
     dappDetection: [{
-      setting: getSetting(settings.METAMASK_PROMPT_DISMISSED) ? 'block' : 'allow',
+      setting: getSetting(settings.METAMASK_PROMPT_DISMISSED) || getSetting(settings.METAMASK_ENABLED) ? 'block' : 'allow',
       primaryPattern: '*'
     }],
     popups: [{