0.6.0b2

- add popup with button for adding and removing sites from the whitelist
- misc bugfixes and streamlining

Author: claustromaniac

src/bg/classes.js

@@ -1,19 +1,25 @@
 class Settings {
 	constructor() {
+		this.ignored = {}; // hostname:unixTimeStamp pairs
 		this.defaults = {
-			'ignored': {}, // hostname:unixTimeStamp pairs
-			'ignorePeriod': 7 //-1 = permanent, 0 = session-only, 1+ = X days
+			'ignorePeriod': 7, //-1 = permanent, 0 = session-only, 1+ = X days
+			'whitelist': {}
 		};
 		this.loading = (async () => {
-			let saved = await browser.storage.local.get(this.defaults);
+			const data = browser.storage.local;
+			let saved = await data.get(this.defaults);
 			this.all = saved;
-			await browser.storage.local.set(saved);
+			await data.set(saved);
+			if (this.ignorePeriod) data.get().then(r => {
+				this.ignored = r.ignored;
+			});
 			browser.storage.onChanged.addListener((changes, area) => {
 				console.debug(`HTTPZ: ${area} storage changed`);
 				for (const i in changes) {
 					if (changes[i].hasOwnProperty('newValue')) this[i] = changes[i].newValue;
 					else if (changes[i].hasOwnProperty('oldValue')) delete this[i];
 				}
+				if (changes.ignorePeriod) data.set({ignored: this.ignored});
 			});
 			console.log('HTTPZ: settings loaded');
 			delete this.loading;
@@ -30,11 +36,6 @@ class Settings {
 	set all(obj) {
 		for (const i in obj) this[i] = obj[i];
 	}
-	save() {
-		this.all.then(r => {
-			browser.storage.local.set(r);
-		});
-	}
 }
 
 class DelayableAction {

src/bg/runtime.js

@@ -1,4 +1,14 @@
+const wlSaver = new DelayableAction(10, 60, () => {
+	browser.storage.local.set({whitelist: settings.whitelist});
+});
 browser.runtime.onMessage.addListener((msg, sender, sendResponse) => {
-	// triggered by options page script
-	return settings.all;
+	if (msg === 'options') return settings.all; // triggered by options page script
+	// triggered by popup script
+	if (msg.value) {
+		wlSaver.run();
+		return (async () => {return settings.whitelist[msg.host] = true;})();
+	} else if (msg.host) {
+		wlSaver.run();
+		return (async () => {return delete settings.whitelist[msg.host];})();
+	}
 });

src/bg/webRequest.js

@@ -4,10 +4,11 @@ const processed = new Set();
 const stackCleaner = new DelayableAction(60, 120, () => {
 	processed.clear();
 });
-const saver = new DelayableAction(10, 60, () => {
-	settings.save();
+const ignoredSaver = new DelayableAction(10, 60, () => {
+	if (settings.ignorePeriod) browser.storage.local.set({ignored: settings.ignored});
 });
-const filter = {urls: ["https://*/*"], types: ['main_frame']};
+const filter = {urls: ["http://*/*"], types: ['main_frame']};
+const sfilter = {urls: ["https://*/*"], types: ['main_frame']};
 const error_rx = /^SEC_ERROR|(?:_|\b)(?:SSL|TLS|CERT)(?:_|\b)|\b[Cc]ertificate/;
 const other_errors = new Set([
 	'MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED',
@@ -22,7 +23,7 @@ const other_errors = new Set([
 function ignore(host) {
 	if (!settings.ignored[host]) {
 		settings.ignored[host] = Date.now();
-		if (settings.ignorePeriod) saver.run();
+		if (settings.ignorePeriod) ignoredSaver.run();
 	}
 }
 
@@ -51,6 +52,7 @@ browser.webRequest.onBeforeRequest.addListener(d => {
 	}
 	if (
 		!settings.ignored[url.hostname] &&
+		!settings.whitelist[url.hostname] &&
 		url.hostname !== 'localhost' &&
 		url.hostname !== 'loopback' &&
 		!/^127\.\d+\.\d+\.\d+$/.test(url.hostname)
@@ -60,7 +62,7 @@ browser.webRequest.onBeforeRequest.addListener(d => {
 		url.protocol = 'https:';
 		return {redirectUrl: url.toString()}
 	}
-}, {urls: ["http://*/*"], types: ['main_frame']}, ['blocking']);
+}, filter, ['blocking']);
 
 browser.webRequest.onBeforeRedirect.addListener(d => {
 	const url = new URL(d.url);
@@ -71,12 +73,18 @@ browser.webRequest.onBeforeRedirect.addListener(d => {
 		processed.add(newTarget.hostname);
 		stackCleaner.run();
 	}
-}, filter);
+}, sfilter);
 
 browser.webRequest.onCompleted.addListener(d => {
 	const url = new URL(d.url);
-	if ( d.statusCode >= 400 && processed.has(url.hostname)
-		&& !settings.ignored[url.hostname] ) downgrade(url, d);
+	if (!processed.has(url.hostname)) return;
+	if ( d.statusCode >= 400 && !settings.ignored[url.hostname] ) downgrade(url, d);
+	else browser.pageAction.show(d.tabId);
+}, sfilter);
+
+browser.webRequest.onCompleted.addListener(d => {
+	const url = new URL(d.url);
+	if (settings.whitelist[url.hostname]) browser.pageAction.show(d.tabId);
 }, filter);
 
 browser.webRequest.onErrorOccurred.addListener(d => {
@@ -85,4 +93,4 @@ browser.webRequest.onErrorOccurred.addListener(d => {
 		( error_rx.test(d.error) || other_errors.has(d.error) )
 	) downgrade(url, d);
 	else console.info(`Error info: ${d.error}`);
-}, filter);
+}, sfilter);

src/manifest.json

@@ -23,11 +23,18 @@
 		"browser_style": true,
 		"page": "pages/options.htm"
 	},
+	"page_action": {
+		"browser_style": true,
+		"default_icon": {"64": "assets/httpz.svg"},
+		"default_popup": "pages/popup.htm",
+		"default_title": "HTTPZ"
+	},
 	"permissions": [
 		"storage",
+		"tabs",
 		"webRequest",
 		"webRequestBlocking",
 		"<all_urls>"
 	],
-	"version": "0.6.0b"
+	"version": "0.6.0b2"
 }

src/pages/options.js

@@ -1,19 +1,6 @@
 'use strict';
 
-var settings;
-
-const ui = (() => {
-  const dom = document.getElementsByTagName('*');
-  return new Proxy(dom, {
-	get: function(obj, prop) {
-	  return obj[prop];
-	},
-	set: function(obj, prop, val) {
-		obj[prop].value = val;
-		return true;
-	}
-  });
-})();
+const ui = document.getElementsByTagName('*');
 
 function setStatus(msg, type) {
 	ui.status.textContent = msg;
@@ -23,8 +10,7 @@ function setStatus(msg, type) {
 	}, 2500);
 }
 
-browser.runtime.sendMessage(true).then(msg => {
-	settings = msg;
+browser.runtime.sendMessage('options').then(msg => {
 	ui.session.checked = !msg.ignorePeriod;
 	ui.xdays.checked = msg.ignorePeriod > 0;
 	ui.days.disabled = !ui.xdays.checked;
@@ -33,31 +19,31 @@ browser.runtime.sendMessage(true).then(msg => {
 	const changePeriod = e => {
 		ui.days.disabled = !ui.xdays.checked;
 		if (ui.xdays.checked) {
-			ui.days.value = settings.ignorePeriod > 0 ? settings.ignorePeriod : 1;
+			ui.days.value = msg.ignorePeriod > 0 ? msg.ignorePeriod : 1;
 		}
 	};
 	ui.session.onchange = changePeriod;
 	ui.xdays.onchange = changePeriod;
 	ui.permanent.onchange = changePeriod;
 	ui.clear.onclick = e => {
-		browser.storage.local.set({ignored: {}}).then(() => {;
+		browser.storage.local.set({ignored: {}}).then(() => {
 			setStatus('List of sites cleared', '');
 		});
 	};
 	ui.save.onclick = e => {
-		if (ui.session.checked) {
-			settings.ignorePeriod = 0;
-			settings.ignored = {};
-		} else if (ui.xdays.checked) {
+		const changes = Object.assign({}, msg);
+		if (ui.xdays.checked) {
 			if (!/^\d+$/.test(ui.days.value.toString())) {
 				setStatus('Invalid input', 'error');
 				return;
 			}
-			settings.ignorePeriod = +ui.days.value;
-		} else settings.ignorePeriod = -1;
+			changes.ignorePeriod = +ui.days.value;
+		} else if (ui.session.checked) {
+			changes.ignorePeriod = 0;
+			changes.ignored = {};
+		} else changes.ignorePeriod = -1;
 		setStatus('. . .', '');
-		browser.storage.local.set(settings)
-		.then(() => {
+		browser.storage.local.set(changes).then(() => {
 			setStatus('Saved!', 'saved');
 		});
 	};

src/pages/popup.css

@@ -0,0 +1,11 @@
+* {
+	box-sizing: border-box;
+	text-align: center;
+}
+body {
+	display: table;
+	padding: 2em;
+	width: 30em;
+}
+p { font-weight: 100; }
+button { margin-left: 0.25em; }

src/pages/popup.htm

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<link href="popup.css" rel="stylesheet">
+	</head>
+	<body>
+		<p id="info"></p>
+		<button class="browser-style" id="whitelist"></button>
+		<script src="popup.js"></script>
+	</body>
+</html>

src/pages/popup.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const ui = document.getElementsByTagName('*');
+
+browser.tabs.query({active: true, currentWindow: true}).then(tabs => {
+	const tab = tabs[0];
+	const url = new URL(tab.url);
+	if (url.protocol === 'https:') {
+		ui.info.textContent = `${url.hostname} was automatically redirected to HTTPS. Click the button below to whitelist this site and reload the tab in HTTP.`;
+		ui.whitelist.textContent = 'whitelist';
+		ui.whitelist.onclick = e => {
+			ui.whitelist.disabled = true;
+			browser.runtime.sendMessage({host: url.hostname, value: true}).then(() => {
+				url.protocol = 'http:';
+				browser.tabs.update(
+					tab.id,
+					{ loadReplace: true, url: url.toString() }
+				);
+			});
+		};
+	} else {
+		ui.info.textContent = `HTTPZ did not try to redirect ${url.hostname} to HTTPS because it is in the whitelist. Click the button below to remove this site from the whitelist and attempt to reload the tab in HTTPS.`;
+		ui.whitelist.textContent = 'remove from whitelist';
+		ui.whitelist.onclick = e => {
+			ui.whitelist.disabled = true;
+			browser.runtime.sendMessage({host: url.hostname, value: false}).then(() => {
+				browser.tabs.reload(tab.id);
+			});
+		};
+	}
+});