Fetch Extension Metadata on eth_requestAccounts

Fix
MetaMask · Aug 20, 2019 · c61aaba · c61aaba
1 parent 8215296
commit c61aaba
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/app/manifest.json b/app/manifest.json
@@ -72,7 +72,8 @@
     "activeTab",
     "webRequest",
     "*://*.eth/",
-    "notifications"
+    "notifications",
+    "management"
   ],
   "web_accessible_resources": [
     "inpage.js",

diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js
@@ -30,7 +30,7 @@ class ProviderApprovalController extends SafeEventEmitter {
    *
    * @param {object} opts - opts for the middleware contains the origin for the middleware
    */
-  createMiddleware ({ origin, getSiteMetadata }) {
+  createMiddleware ({ origin, getSiteMetadata, getExtensionMetadata }) {
     return createAsyncMiddleware(async (req, res, next) => {
       // only handle requestAccounts
       if (req.method !== 'eth_requestAccounts') return next()
@@ -40,8 +40,11 @@ class ProviderApprovalController extends SafeEventEmitter {
         res.result = [this.preferencesController.getSelectedAddress()]
         return
       }
+
+      // get metadata from origin if extension or site
+      const metadata = await getExtensionMetadata(origin) || await getSiteMetadata(origin)
+
       // register the provider request
-      const metadata = await getSiteMetadata(origin)
       this._handleProviderRequest(origin, metadata.name, metadata.icon)
       // wait for resolution of request
       const approved = await new Promise(resolve => this.once(`resolvedRequest:${origin}`, ({ approved }) => resolve(approved)))

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -1358,9 +1358,9 @@ module.exports = class MetamaskController extends EventEmitter {
    * @param {*} outStream - The stream to provide over.
    * @param {string} origin - The URI of the requesting resource.
    */
-  setupProviderConnection (outStream, origin, publicApi) {
-    const getSiteMetadata = publicApi && publicApi.getSiteMetadata
-    const engine = this.setupProviderEngine(origin, getSiteMetadata)
+  setupProviderConnection (outStream, origin, publicApi = {}) {
+    const {getSiteMetadata, getExtensionMetadata} = publicApi
+    const engine = this.setupProviderEngine(origin, getSiteMetadata, getExtensionMetadata)
 
     // setup connection
     const providerStream = createEngineStream({ engine })
@@ -1384,7 +1384,7 @@ module.exports = class MetamaskController extends EventEmitter {
   /**
    * A method for creating a provider that is safely restricted for the requesting domain.
    **/
-  setupProviderEngine (origin, getSiteMetadata) {
+  setupProviderEngine (origin, getSiteMetadata, getExtensionMetadata) {
     // setup json rpc engine stack
     const engine = new RpcEngine()
     const provider = this.provider
@@ -1409,6 +1409,7 @@ module.exports = class MetamaskController extends EventEmitter {
     engine.push(this.providerApprovalController.createMiddleware({
       origin,
       getSiteMetadata,
+      getExtensionMetadata,
     }))
     // forward to metamask primary provider
     engine.push(providerAsMiddleware(provider))
@@ -1470,6 +1471,30 @@ module.exports = class MetamaskController extends EventEmitter {
         const remote = await getRemote()
         return await pify(remote.getSiteMetadata)()
       },
+
+      getExtensionMetadata: (extensionId) => {
+        return new Promise((resolve) => {
+          if (!window.chrome || !window.chrome.management) {
+            return resolve(null)
+          }
+
+          window.chrome.management.getAll(extensions => {
+            if (!extensions) {
+              return resolve(null)
+            }
+
+            const extension = extensions.find(({enabled, id}) => enabled && id === extensionId)
+
+            if (!extension) {
+              return resolve(null)
+            }
+
+            const icon = extension.icons.reduce((largestIcon, icon) => icon.size > largestIcon.size ? icon : largestIcon, { size: 0 })
+
+            return resolve({name: extension.name, icon: icon.url})
+          })
+        })
+      },
     }
 
     return publicApi