From 3d8ebf2265d167923f3b913bac3b9cc4d37fa052 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 26 Jul 2017 12:10:42 -0700
Subject: Begin implementing live-updating blacklist, not working yet

---
 app/scripts/background.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'app/scripts/background.js')

diff --git a/app/scripts/background.js b/app/scripts/background.js
index e8987394f..c9505b237 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -90,6 +90,10 @@ function setupController (initState) {
 
   extension.runtime.onConnect.addListener(connectRemote)
   function connectRemote (remotePort) {
+    if (remotePort.name === 'blacklister') {
+      return setupBlacklist(connectRemote)
+    }
+
     var isMetaMaskInternalProcess = remotePort.name === 'popup' || remotePort.name === 'notification'
     var portStream = new PortStream(remotePort)
     if (isMetaMaskInternalProcess) {
@@ -135,6 +139,29 @@ function setupController (initState) {
   return Promise.resolve()
 }
 
+// Listen for new pages and return if blacklisted:
+function setupBlacklist (port) {
+  console.log('Blacklist connection established')
+  const handler = handleNewPageLoad.bind(port)
+  port.onMessage.addListener(handler)
+  setTimeout(() => {
+    port.onMessage.removeListener(handler)
+  }, 30000)
+}
+
+function handleNewPageLoad (message) {
+  const { pageLoaded } = message
+  console.log('blaclist message received', message.pageLoaded)
+  if (!pageLoaded || !global.metamaskController) return
+
+  const state = global.metamaskController.getState()
+  const { blacklist } = state.metamask
+
+  if (blacklist && blacklist.includes(pageLoaded)) {
+    this.postMessage({ 'blacklist': pageLoaded })
+  }
+}
+
 //
 // Etc...
 //
-- 
cgit v1.2.3


From 8b1726cc550d4a5b142a2a525ce6b94713dc04e0 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 26 Jul 2017 16:30:54 -0700
Subject: Live update blacklist from Infura

---
 app/scripts/background.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'app/scripts/background.js')

diff --git a/app/scripts/background.js b/app/scripts/background.js
index c9505b237..01bb39186 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -91,7 +91,7 @@ function setupController (initState) {
   extension.runtime.onConnect.addListener(connectRemote)
   function connectRemote (remotePort) {
     if (remotePort.name === 'blacklister') {
-      return setupBlacklist(connectRemote)
+      return checkBlacklist(remotePort)
     }
 
     var isMetaMaskInternalProcess = remotePort.name === 'popup' || remotePort.name === 'notification'
@@ -140,25 +140,23 @@ function setupController (initState) {
 }
 
 // Listen for new pages and return if blacklisted:
-function setupBlacklist (port) {
-  console.log('Blacklist connection established')
-  const handler = handleNewPageLoad.bind(port)
+function checkBlacklist (port) {
+  const handler = handleNewPageLoad.bind(null, port)
   port.onMessage.addListener(handler)
   setTimeout(() => {
     port.onMessage.removeListener(handler)
   }, 30000)
 }
 
-function handleNewPageLoad (message) {
+function handleNewPageLoad (port, message) {
   const { pageLoaded } = message
-  console.log('blaclist message received', message.pageLoaded)
   if (!pageLoaded || !global.metamaskController) return
 
   const state = global.metamaskController.getState()
-  const { blacklist } = state.metamask
+  const { blacklist } = state
 
   if (blacklist && blacklist.includes(pageLoaded)) {
-    this.postMessage({ 'blacklist': pageLoaded })
+    port.postMessage({ 'blacklist': pageLoaded })
   }
 }
 
-- 
cgit v1.2.3