Upload files to 'addon_firefox/ismitmlink'

3 files changed, 34 insertions, 12 deletions

diff --git a/addon_firefox/ismitmlink/bg.js b/addon_firefox/ismitmlink/bg.js
index fe362dd1..a8e8ddff 100644
--- a/addon_firefox/ismitmlink/bg.js
+++ b/addon_firefox/ismitmlink/bg.js
@@ -1,5 +1,4 @@
 let apiurl = 'https://api.searxes.eu.org/_/ismitm.php';
-
 fetch('http://api.xxf4en4djo7hhvatax2g3lvj2qgvbwi4yeyyzwpo25zcog4ewhsbrdyd.onion/_/ok.php', {
 	method: 'GET',
 	mode: 'cors'
@@ -49,19 +48,22 @@ function i_already_know_you(f) {
 	});
 }
 
-function clear_cache_2w() {
+function clear_cache_1w() {
 	browser.storage.local.clear();
 	browser.storage.local.set({
 		'lastU': Math.round((new Date()).getTime() / 1000)
 	});
+	browser.storage.local.set({
+		'lastV': (browser.runtime.getManifest()).version
+	});
 	setTimeout(function () {
-		clear_cache_2w();
-	}, 1209600000);
+		clear_cache_1w();
+	}, 604800000);
 }
 
-browser.storage.local.get('lastxU').then(g => {
+browser.storage.local.get(['lastU', 'lastV']).then(g => {
 	if (g.lastU) {
-		if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 1209600) {
+		if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 604800) {
 			browser.storage.local.clear();
 			browser.storage.local.set({
 				'lastU': Math.round((new Date()).getTime() / 1000)
@@ -72,9 +74,20 @@ browser.storage.local.get('lastxU').then(g => {
 			'lastU': Math.round((new Date()).getTime() / 1000)
 		});
 	}
+	let nowVer = (browser.runtime.getManifest()).version;
+	if (g.lastV != nowVer) {
+		console.log('Updated', nowVer);
+		browser.storage.local.clear();
+		browser.storage.local.set({
+			'lastU': Math.round((new Date()).getTime() / 1000)
+		});
+		browser.storage.local.set({
+			'lastV': nowVer
+		});
+	}
 	setTimeout(function () {
-		clear_cache_2w();
-	}, 1209600000);
+		clear_cache_1w();
+	}, 604800000);
 });
 
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
@@ -95,4 +108,4 @@ browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
 			}
 		}, () => {});
 	}
-});
+});
\ No newline at end of file
diff --git a/addon_firefox/ismitmlink/cs.js b/addon_firefox/ismitmlink/cs.js
index 1471aa08..03ebcda0 100644
--- a/addon_firefox/ismitmlink/cs.js
+++ b/addon_firefox/ismitmlink/cs.js
@@ -9,6 +9,8 @@ if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lw
 		cs.insertRule("a[data-mitm]::before{content:'[\\26A0]';font-weight:bold !important;color:red !important;display:inline-block !important}", 1);
 		cs.insertRule("a[data-mitm]:hover::before{content:'[\\26A1]'}", 2);
 		cs.insertRule("a[data-mitm]:hover{color:red !important}", 3);
+		cs.insertRule("img[data-mitm]{cursor:not-allowed !important;border:2px red dotted !important}", 4);
+		cs.insertRule("img[data-mitm]:hover{transform:scaleY(-1);filter:sepia(70%)}", 5);
 	}
 	let asked = ['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lwy6ps54yd.onion', 'searxes.eu.org', 'api.searxes.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org'];
 	document.querySelectorAll("a[href^='http://']:not([data-mitm]),a[href^='https://']:not([data-mitm]),a[href^='//']:not([data-mitm])").forEach(a => {
@@ -18,10 +20,17 @@ if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lw
 			browser.runtime.sendMessage(aF);
 		}
 	});
+	document.querySelectorAll("img[src^='http://']:not([data-mitm]),img[src^='https://']:not([data-mitm]),img[src^='//']:not([data-mitm])").forEach(a => {
+		let aF = (new URL(a.src)).hostname;
+		if (!/^(.*)\.(danwin1210\.me|onion|i2p|invalid|test|local|localhost|([0-9]{1,3})|bbs|chan|cyb|dyn|geek|gopher|indy|libre|neo|null|o|oss|oz|parody|pirate|bit|lib|coin|emc|bazar|fur)$/.test(aF) && !asked.includes(aF)) {
+			asked.push(aF);
+			browser.runtime.sendMessage(aF);
+		}
+	});
 	browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
 		if (request.length == 2) {
 			if (request[1]) {
-				document.querySelectorAll("a[href^='http://" + request[0] + "/']:not([data-mitm]),a[href^='https://" + request[0] + "/']:not([data-mitm]),a[href^='//" + request[0] + "/']:not([data-mitm])").forEach(a => {
+				document.querySelectorAll("a[href^='http://" + request[0] + "/']:not([data-mitm]),a[href^='https://" + request[0] + "/']:not([data-mitm]),a[href^='//" + request[0] + "/']:not([data-mitm]),img[src^='http://" + request[0] + "/']:not([data-mitm]),img[src^='https://" + request[0] + "/']:not([data-mitm]),img[src^='//" + request[0] + "/']:not([data-mitm])").forEach(a => {
 					a.dataset.mitm = 1;
 					a.title = 'MITM!';
 				});
diff --git a/addon_firefox/ismitmlink/manifest.json b/addon_firefox/ismitmlink/manifest.json
index dee491bd..9e5939f4 100644
--- a/addon_firefox/ismitmlink/manifest.json
+++ b/addon_firefox/ismitmlink/manifest.json
@@ -2,7 +2,7 @@
    "manifest_version": 2,
    "name": "Are links vulnerable to MITM attack?",
    "description": "Scan FQDN using Searxes' API",
-   "version": "1.0.10",
+   "version": "1.0.11",
    "homepage_url": "https://codeberg.org/crimeflare/cloudflare-tor",
    "author": "Maslin Bossé",
    "permissions": [
@@ -32,7 +32,7 @@
    "applications": {
       "gecko": {
          "id": "ismitmlink@searxes.danwin1210.me",
-         "strict_min_version": "56.0",
+         "strict_min_version": "60.0",
          "update_url":"https://api.searxes.eu.org/_/addon.php?for=ismitmlink"
       }
    }