Updates from feedback
diff --git a/build/UserALEWebExtension/background.js b/build/UserALEWebExtension/background.js
index 42a3550..7628b4c 100644
--- a/build/UserALEWebExtension/background.js
+++ b/build/UserALEWebExtension/background.js
@@ -1174,6 +1174,8 @@
});
});
}
+
+// Filter out logs with urls that do not match the regex defined in extension options.
function filterUrl(log) {
if (urlWhitelist.test(log.pageUrl)) {
return log;
@@ -1181,20 +1183,16 @@
return false;
}
browser.storage.local.get(defaultConfig, function (res) {
- addCallbacks({
- filterUrl: filterUrl
- });
+ // Apply url filter to logs generated by the background page.
+ addCallbacks(filterUrl);
updateConfig(res);
});
browser.runtime.onMessage.addListener(function (message) {
switch (message.type) {
- // Handles logs rerouted from content and option scripts
+ // Handles logs rerouted from content and option scripts.
case ADD_LOG:
- var var log$1 = filterUrl$1 = message.payload;
- if ("tab" in sender && "id" in sender.tab) {
- log$1["tabId"] = sender.tab.id;
- }
- log(log$1);
+ // Apply url filter to logs generated outside the background page.
+ var log$1 = filterUrl(message.payload);
if (log$1) {
log(log$1);
}
diff --git a/build/UserALEWebExtension/content.js b/build/UserALEWebExtension/content.js
index 2c158e6..fd9c5e1 100644
--- a/build/UserALEWebExtension/content.js
+++ b/build/UserALEWebExtension/content.js
@@ -1128,9 +1128,7 @@
browser.storage.local.get("useraleConfig", function (res) {
options(res.useraleConfig);
- addCallbacks({
- reroute: rerouteLog
- });
+ addCallbacks(rerouteLog);
});
browser.runtime.onMessage.addListener(function (message) {
if (message.type === CONFIG_CHANGE) {
diff --git a/build/UserALEWebExtension/options.js b/build/UserALEWebExtension/options.js
index 628b79e..330c831 100644
--- a/build/UserALEWebExtension/options.js
+++ b/build/UserALEWebExtension/options.js
@@ -1126,9 +1126,7 @@
* limitations under the License.
*/
-addCallbacks({
- reroute: rerouteLog
-});
+addCallbacks(rerouteLog);
function setConfig() {
var config = {
url: document.getElementById("url").value,
diff --git a/src/UserALEWebExtension/background.js b/src/UserALEWebExtension/background.js
index 8c33b3f..b095127 100644
--- a/src/UserALEWebExtension/background.js
+++ b/src/UserALEWebExtension/background.js
@@ -43,6 +43,7 @@
function updateConfig(config) {
urlWhitelist = new RegExp(config.pluginConfig.urlWhitelist);
userale.options(config.useraleConfig);
+ // TODO: tabs need a page load to apply this config change.
dispatchTabMessage(config.useraleConfig);
}
@@ -54,6 +55,7 @@
});
}
+// Filter out logs with urls that do not match the regex defined in extension options.
function filterUrl(log) {
if(urlWhitelist.test(log.pageUrl)) {
return log
@@ -62,7 +64,8 @@
}
browser.storage.local.get(defaultConfig, (res) => {
- userale.addCallbacks({filterUrl:filterUrl});
+ // Apply url filter to logs generated by the background page.
+ userale.addCallbacks(filterUrl);
updateConfig(res);
});
@@ -80,13 +83,17 @@
browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
switch (message.type) {
- // Handles logs rerouted from content and option scripts
+ // Handles logs rerouted from content and option scripts.
case MessageTypes.ADD_LOG:
+<<<<<<< HEAD
let log = message.payload;
if("tab" in sender && "id" in sender.tab) {
log["tabId"] = sender.tab.id;
}
+ // Apply url filter to logs generated outside the background page.
log = filterUrl(log);
+=======
+>>>>>>> 9f626ab (Updates from feedback)
if(log) {
userale.log(log);
}
diff --git a/src/UserALEWebExtension/content.js b/src/UserALEWebExtension/content.js
index 101882b..135a97d 100644
--- a/src/UserALEWebExtension/content.js
+++ b/src/UserALEWebExtension/content.js
@@ -23,7 +23,7 @@
browser.storage.local.get("useraleConfig", (res) => {
userale.options(res.useraleConfig);
- userale.addCallbacks({reroute: rerouteLog});
+ userale.addCallbacks(rerouteLog);
});
browser.runtime.onMessage.addListener(function (message) {
diff --git a/src/UserALEWebExtension/options.js b/src/UserALEWebExtension/options.js
index 53b5765..8dc593e 100644
--- a/src/UserALEWebExtension/options.js
+++ b/src/UserALEWebExtension/options.js
@@ -20,7 +20,7 @@
import * as userale from '../main.js'
import { rerouteLog, browser } from './globals.js';
-userale.addCallbacks({reroute: rerouteLog});
+userale.addCallbacks(rerouteLog);
// TODO: Warn users when setting credentials with unsecured connection.
const mitmWarning = "Setting credentials with http will expose you to a MITM attack. Are you sure you want to continue?";
@@ -46,7 +46,7 @@
browser.storage.local.set(payload, () => {
userale.options(config);
- browser.runtime.sendMessage({ type: MessageTypes.CONFIG_CHANGE, payload: payload });
+ browser.runtime.sendMessage({ type: MessageTypes.CONFIG_CHANGE, payload });
});
}
