From 9fe35a9aef0392f4df0203ffc076ee9c9d742b00 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 17 Oct 2017 22:52:56 -0400
Subject: [PATCH] filter senders for autofill

---
 src/background.js                          | 14 +++++++++++---
 src/popup/app/current/currentController.js | 11 +++++++----
 src/popup/app/global/mainController.js     |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/background.js b/src/background.js
index 6c76be7cbe5..116027845e6 100644
--- a/src/background.js
+++ b/src/background.js
@@ -128,7 +128,7 @@ var bg_isBackground = true,
                     frameId: sender.frameId, tab: msg.tab, details: msg.details
                 }], msg.sender === 'autofill_cmd');
             }
-            else {
+            else if (msg.sender === 'contextMenu') {
                 clearTimeout(autofillTimeout);
                 pageDetailsToAutoFill.push({ frameId: sender.frameId, tab: msg.tab, details: msg.details });
                 autofillTimeout = setTimeout(autofillPage, 300);
@@ -569,7 +569,11 @@ var bg_isBackground = true,
             return;
         }
 
-        chrome.tabs.sendMessage(tab.id, { command: 'collectPageDetails', tab: tab, sender: sender }, function () {
+        chrome.tabs.sendMessage(tab.id, {
+            command: 'collectPageDetails',
+            tab: tab,
+            sender: sender
+        }, function () {
             if (chrome.runtime.lastError) {
                 return;
             }
@@ -732,7 +736,11 @@ var bg_isBackground = true,
                 return;
             }
 
-            chrome.tabs.sendMessage(tab.id, { command: 'collectPageDetails', tab: tab, sender: 'contextMenu' }, function () {
+            chrome.tabs.sendMessage(tab.id, {
+                command: 'collectPageDetails',
+                tab: tab,
+                sender: 'contextMenu'
+            }, function () {
             });
         });
     }
diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index ba305ede15c..44809b2c2d3 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -40,10 +40,13 @@ angular
                     return;
                 }
 
-                chrome.tabs.sendMessage(tabs[0].id,
-                    { command: 'collectPageDetails', tab: tabs[0], sender: 'currentController' }, function () {
-                        canAutofill = true;
-                    });
+                chrome.tabs.sendMessage(tabs[0].id, {
+                    command: 'collectPageDetails',
+                    tab: tabs[0],
+                    sender: 'currentController'
+                }, function () {
+                    canAutofill = true;
+                });
 
                 var otherTypes = [constantsService.cipherType.card, constantsService.cipherType.identity];
                 cipherService.getAllDecryptedForDomain(domain, otherTypes).then(function (ciphers) {
diff --git a/src/popup/app/global/mainController.js b/src/popup/app/global/mainController.js
index f3bb2b4b4e2..092673bcc44 100644
--- a/src/popup/app/global/mainController.js
+++ b/src/popup/app/global/mainController.js
@@ -78,7 +78,7 @@ angular
                     $state.go('home');
                 });
             }
-            else if (msg.command === 'collectPageDetailsResponse') {
+            else if (msg.command === 'collectPageDetailsResponse' && msg.sender === 'currentController') {
                 $scope.$broadcast('collectPageDetailsResponse', {
                     frameId: sender.frameId,
                     tab: msg.tab,