Rudimentary message passing

Now can pass messages between webpage, popup and background.

source/common/background/cookiestore.js

-"use strict";
+"use strict"
 
 // Initialize the cookie database upon extension installation
 
-const platform = chrome;
+const platform = chrome
+
+const urlPopup = window.location.origin + "/pages/popup/popup.html"
 
 // TODO: make an actual datasructure.
 var cookieDatabase = {}
@@ -28,6 +30,24 @@ platform.runtime.onInstalled.addListener (function() {
 		if (result)
 			onPermissionWebRequestGranted()
 	})
+
+	// Listen for incomming messages form other pages (popup)
+	platform.runtime.onMessage.addListener(function(message, sender/*, sendResponse*/){
+/*	sender.envType takes on useful values "content_child" and "addon_child" */
+		switch (sender.url){
+			case urlPopup:
+				if(message.popupOpen === true) {
+					console.log("Popup open", sender, message)
+//					sendResponse(cookieDatabase)
+				}
+				if(message.popupOpen === false) {
+					console.log("Popup closed", sender, message)
+				}
+				break
+			default:
+				console.log("Unknown message", message, sender)
+		}
+	})
 })
 
 
@@ -70,7 +90,7 @@ function onPermissionWebRequestGranted(){
 	// TODO: Difference between "set-cookie" and "Set-Cookie"
 	// TODO: support protocols other than HTTP(S)
 	function watchCookiesSet(details){
-//		console.log(details)
+		//console.log(details)
 
 		// Get additional parameters
 		const protocol = details.url.substring(0, details.url.indexOf("://"))
@@ -80,7 +100,7 @@ function onPermissionWebRequestGranted(){
 				const name = value.substring(0, value.indexOf("="))
 					
 				console.log("Cookie set: ", name)
-				cookieDatabase[name] = {secureOrigin: protocol === "https", httpOrigin: true}
+				cookieDatabase[name] = {secureOrigin: protocol === "https", httpOnly: true}
 			}
 		} /*else {
 				console.log(details.responseHeaders[i].name)
@@ -88,11 +108,17 @@ function onPermissionWebRequestGranted(){
 		return {responseHeaders: details.responseHeaders}
 	}
 
+	function logError(details){
+		console.log("Network error, e.g. other extension blocked")
+	}
+
 	platform.webRequest.onBeforeSendHeaders.addListener (watchCookiesSent,
 		{urls: urls}, ["blocking", "requestHeaders"])
 
 	platform.webRequest.onHeadersReceived.addListener (watchCookiesSet,
 		{urls: urls}, ["blocking", "responseHeaders"])
+
+	platform.webRequest.onErrorOccurred.addListener(logError, {urls: urls})
 }
 
 function recordCookieChange(/*object*/ changeInfo){

source/common/content_scripts/inject.js

@@ -2,8 +2,15 @@
 
 (function() {
 	// Execute the actal payload in the context of the window
-	var s = document.createElement("script");
-	s.src = chrome.extension.getURL("/web_accessible_resources/inject.js");
-	(document.head || document.documentElement).appendChild(s);
-	s.parentNode.removeChild(s);
-})()
+	var s = document.createElement("script")
+	s.src = chrome.extension.getURL("/web_accessible_resources/inject.js")
+	(document.head || document.documentElement).appendChild(s)
+	s.parentNode.removeChild(s)
+})()
\ No newline at end of file
+
+document.addEventListener("cookie_message", function(event) {
+	// We only accept messages from ourselves
+//	if (event.source != window)
+//		return
+	chrome.runtime.sendMessage(event.detail)
+})

source/common/pages/options_ui/options_ui.html

@@ -33,7 +33,7 @@
     <p>This setting works similarly to the Chromium content settings. This is just the list of "origins" specified in the permissions. Simply put, the extension will only run on the pages matching at least one expression:</p>
     <form id="newOriginForm">
     <label for="newOrigin">New origin</label>
-    <input type="url" id="newOrigin" placeholder="https://example.com/" required>
+    <input type="text" id="newOrigin" placeholder="https://example.com/" required>
     <input type="submit" value="Add origin">
     </form>
     <p>TODO: for some reasson, domains have to end with slash.</p>

source/common/pages/popup/popup.js

 "use strict";
 
+// Notify other pages (background) that popup is open
+platform.runtime.sendMessage({popupOpen: true})
+
+/*
+TODO: uncomment and figure out source of warnings
+window.addEventListener("unload", function(evt){
+	platform.runtime.sendMessage({popupOpen: false})
+	return true
+})*/
+
 const mainMenu = document.getElementById("main-menu")
 
 const mainMenuMonitoring = document.getElementById ("main-menu-monitoring")
@@ -21,6 +31,7 @@ function debugMessage(message){
 	document.body.appendChild(div)
 }
 
+
 document.addEventListener("DOMContentLoaded", function() {
 
 	mainMenu.addEventListener("click", function(evt) {

source/common/web_accessible_resources/inject.js

 // This code is executed in the context of the window
 
-var injectionSuccessful = true;
+var injectionSuccessful = true
 
-console.log("Injection completed, try logging the variable injectionSuccessful");
+console.log("Injection completed, try logging the variable injectionSuccessful")
\ No newline at end of file
+
+function sendMessage(message){
+	var event = new CustomEvent("cookie_message", {detail: message})
+	document.dispatchEvent(event)
+}
+
+/*
+ * Function processing cookie during retreival
+ */
+function processCookieString(cookieString){
+	console.log("Cookie read: ", cookieString)
+	sendMessage({"event": "read"})
+	return cookieString
+}
+
+/*
+ * Function processing cookie during assignment
+ */
+function processSetCookieStr(cookieString){
+	console.log("Cookie set: ", cookieString)
+	sendMessage({"event": "write", "cookie": cookieString})
+	return cookieString
+}
+
+/*
+ * Wedge custom cookie handlers in regular setters and getters
+ */
+var cookieGetter = document.__lookupGetter__("cookie").bind(document)
+var cookieSetter = document.__lookupSetter__("cookie").bind(document)
+
+Object.defineProperty (document, "cookie", {
+	get: function() {
+		return processCookieString (cookieGetter())
+	},
+
+	set: function(cookieString) {
+		return cookieSetter (processSetCookieStr(cookieString))
+	}
+})