MetaMask · brunobar79 · Nov 21, 2018 · Aug 5, 2018 · Aug 5, 2018 · Aug 8, 2018
@@ -10,6 +10,7 @@ development/states.js
 
 app/scripts/lib/extension-instance.js
 app/scripts/chromereload.js
+app/vendor/**
 
 ui/lib/blockies.js
 

@@ -52,6 +52,14 @@
       ],
       "run_at": "document_start",
       "all_frames": true
+    },
+    {
+      "matches": [
+        "*://connect.trezor.io/*/popup.html"
+      ],
+      "js": [
+        "vendor/trezor/content-script.js"
+      ]
     }
   ],
   "permissions": [
@@ -77,4 +85,4 @@
       "*"
     ]
   }
-}
+}
@@ -332,6 +332,10 @@ function setupController (initState, initLangCode) {
     [ENVIRONMENT_TYPE_FULLSCREEN]: true,
   }
 
+  const metamaskBlacklistedPorts = [
+    'trezor-connect',
+  ]
+
   const isClientOpenStatus = () => {
     return popupIsOpen || Boolean(Object.keys(openMetamaskTabsIDs).length) || notificationIsOpen
   }
@@ -352,6 +356,10 @@ function setupController (initState, initLangCode) {
     const processName = remotePort.name
     const isMetaMaskInternalProcess = metamaskInternalProcessHash[processName]
 
+    if (metamaskBlacklistedPorts.includes(remotePort.name)) {
+      return false
+    }
+
     if (isMetaMaskInternalProcess) {
       const portStream = new PortStream(remotePort)
       // communication with popup

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
+    <title>TrezorConnect | Trezor</title>
+    <meta name="description" content="" />
+    <meta name="keywords" content="" />
+    <meta name="author" content="Trezor info@trezor.io" />
+    <meta name="robots" content="noindex, nofollow" />
+    <meta name="title" content="Trezor Connect" />
+    <meta name="theme-color" content="#ffffff" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="-1" />
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            position: relative;
+            width: 100%;
+            height: 100%;
+            min-height: 500px;
+            min-width: 328px;
+        }
+    </style>
+</head>
+<body>
+    <iframe id="trezor-usb-permissions" src="https://connect.trezor.io/5/extension-permissions.html" allow="usb" frameborder="0" width="100%" height="100%"></iframe>
+    <script type="text/javascript" src="./vendor/trezor/usb-permissions.js"></script>
+</body>
@@ -0,0 +1,21 @@
+/*
+Passing messages from background script to popup
+*/
+
+let port = chrome.runtime.connect({ name: 'trezor-connect' });
+port.onMessage.addListener(message => {
+    window.postMessage(message, window.location.origin);
+});
+port.onDisconnect.addListener(d => {
+    port = null;
+});
+
+/*
+Passing messages from popup to background script
+*/
+
+window.addEventListener('message', event => {
+    if (port && event.source === window && event.data) {
+        port.postMessage(event.data);
+    }
+});
@@ -0,0 +1,50 @@
+/*
+Handling messages from usb permissions iframe
+*/
+
+const switchToPopupTab = (event) => {
+
+  window.removeEventListener('beforeunload', switchToPopupTab);
+
+  if (!event) {
+      // triggered from 'usb-permissions-close' message
+      // switch tab to previous index and close current
+      chrome.tabs.query({
+          currentWindow: true,
+          active: true,
+      }, (current) => {
+          if (current.length < 0) return;
+          chrome.tabs.query({
+              index: current[0].index - 1
+          }, popup => {
+              if (popup.length < 0) return;
+              chrome.tabs.update(popup[0].id, { active: true });
+          })
+          chrome.tabs.remove(current[0].id);
+      });
+      return;
+  }
+
+  // triggered from 'beforeunload' event
+  // find tab by popup pattern and switch to it
+  chrome.tabs.query({
+      url: "*://connect.trezor.io/*/popup.html"
+  }, (tabs) => {
+      if (tabs.length < 0) return;
+      chrome.tabs.update(tabs[0].id, { active: true });
+  });
+}
+
+window.addEventListener('message', event => {
+  if (event.data === 'usb-permissions-init') {
+      const iframe = document.getElementById('trezor-usb-permissions');
+      iframe.contentWindow.postMessage({
+          type: 'usb-permissions-init',
+          extension: chrome.runtime.id,
+      }, '*');
+  } else if (event.data === 'usb-permissions-close') {
+      switchToPopupTab();
+  }
+});
+
+window.addEventListener('beforeunload', switchToPopupTab);
@@ -84,6 +84,10 @@ createCopyTasks('fonts', {
   source: './app/fonts/',
   destinations: commonPlatforms.map(platform => `./dist/${platform}/fonts`),
 })
+createCopyTasks('vendor', {
+  source: './app/vendor/',
+  destinations: commonPlatforms.map(platform => `./dist/${platform}/vendor`),
+})
 createCopyTasks('reload', {
   devOnly: true,
   source: './app/scripts/',