diff --git a/addon_firefox/ismitmlink/bg.js b/addon_firefox/ismitmlink/bg.js
index af20d0eea..4e5e82a99 100644
--- a/addon_firefox/ismitmlink/bg.js
+++ b/addon_firefox/ismitmlink/bg.js
@@ -48,8 +48,8 @@ function i_already_know_you(f) {
});
}
-function forget_cache_1w() {
- browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => {
+function forget_cache_2w() {
+ browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg']).then(g => {
browser.storage.local.clear();
browser.storage.local.set({
'ign1': (g.ign1 == 'y' ? 'y' : 'n')
@@ -60,6 +60,9 @@ function forget_cache_1w() {
browser.storage.local.set({
'obs': (g.obs == 'y' ? 'y' : 'n')
});
+ browser.storage.local.set({
+ 'dbg': (g.dbg == 'y' ? 'y' : 'n')
+ });
browser.storage.local.set({
'lastU': Math.round((new Date()).getTime() / 1000)
});
@@ -68,14 +71,14 @@ function forget_cache_1w() {
});
});
setTimeout(function () {
- forget_cache_1w();
- }, 604800000);
+ forget_cache_2w();
+ }, 1209600000);
}
browser.storage.local.get(['lastU', 'lastV']).then(g => {
if (g.lastU) {
- if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 604800) {
- browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => {
+ if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 1209600) {
+ browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg']).then(g => {
browser.storage.local.clear();
browser.storage.local.set({
'ign1': (g.ign1 == 'y' ? 'y' : 'n')
@@ -86,6 +89,9 @@ browser.storage.local.get(['lastU', 'lastV']).then(g => {
browser.storage.local.set({
'obs': (g.obs == 'y' ? 'y' : 'n')
});
+ browser.storage.local.set({
+ 'dbg': (g.dbg == 'y' ? 'y' : 'n')
+ });
browser.storage.local.set({
'lastU': Math.round((new Date()).getTime() / 1000)
});
@@ -99,7 +105,7 @@ browser.storage.local.get(['lastU', 'lastV']).then(g => {
let nowVer = (browser.runtime.getManifest()).version;
if (g.lastV != nowVer) {
console.log('Updated', nowVer);
- browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => {
+ browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg']).then(g => {
browser.storage.local.clear();
browser.storage.local.set({
'ign1': (g.ign1 == 'y' ? 'y' : 'n')
@@ -110,6 +116,9 @@ browser.storage.local.get(['lastU', 'lastV']).then(g => {
browser.storage.local.set({
'obs': (g.obs == 'y' ? 'y' : 'n')
});
+ browser.storage.local.set({
+ 'dbg': (g.dbg == 'y' ? 'y' : 'n')
+ });
browser.storage.local.set({
'lastU': Math.round((new Date()).getTime() / 1000)
});
@@ -119,8 +128,8 @@ browser.storage.local.get(['lastU', 'lastV']).then(g => {
});
}
setTimeout(function () {
- forget_cache_1w();
- }, 604800000);
+ forget_cache_2w();
+ }, 1209600000);
});
browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
@@ -141,4 +150,5 @@ browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
}
}, () => {});
}
+ return;
});
\ No newline at end of file
diff --git a/addon_firefox/ismitmlink/cfg.html b/addon_firefox/ismitmlink/cfg.html
index c8c9f9bcf..860980fab 100644
--- a/addon_firefox/ismitmlink/cfg.html
+++ b/addon_firefox/ismitmlink/cfg.html
@@ -1,8 +1,17 @@
+
+
+
+
+
+ Informoj pri kaŝmemoro
+ Infektita:
+ Ne infektita:
+ Entute:
\ No newline at end of file
diff --git a/addon_firefox/ismitmlink/cs.js b/addon_firefox/ismitmlink/cs.js
index 534c090d9..00679559d 100644
--- a/addon_firefox/ismitmlink/cs.js
+++ b/addon_firefox/ismitmlink/cs.js
@@ -1,9 +1,10 @@
if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lwy6ps54yd.onion', 'searxes.eu.org', 'api.searxes.eu.org'].includes(location.hostname)) {
if (location.protocol === 'moz-extension:' && location.pathname === '/cfg.html') {
- browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => {
+ browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg']).then(g => {
document.getElementById('ign1').checked = (g.ign1 == 'y') ? true : false;
document.getElementById('ign2').checked = (g.ign2 == 'y') ? true : false;
document.getElementById('obs').checked = (g.obs == 'y') ? true : false;
+ document.getElementById('dbg').checked = (g.dbg == 'y') ? true : false;
});
document.getElementById('ign1').addEventListener('click', () => {
browser.storage.local.set({
@@ -20,6 +21,34 @@ if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lw
'obs': (document.getElementById('obs').checked ? 'y' : 'n')
});
});
+ document.getElementById('dbg').addEventListener('click', () => {
+ browser.storage.local.set({
+ 'dbg': (document.getElementById('dbg').checked ? 'y' : 'n')
+ });
+ });
+ browser.storage.local.get().then(g => {
+ let iY = 0,
+ iN = 0,
+ iT, tmp;
+ Object.keys(g).forEach(a => {
+ if (!['ign1', 'ign2', 'obs', 'dbg', 'lastU', 'lastV'].includes(a)) {
+ if (g[a] == 'y') {
+ iY++;
+ }
+ if (g[a] == 'n') {
+ iN++;
+ }
+ }
+ });
+ iT = iY + iN;
+ if (iT > 0) {
+ tmp = (iY * 100 / iT).toFixed(1);
+ document.getElementById('viry').value = iY + ' domajnoj (' + tmp + '%)';
+ tmp = (iN * 100 / iT).toFixed(1);
+ document.getElementById('virn').value = iN + ' domajnoj (' + tmp + '%)';
+ document.getElementById('viro').value = (iY + iN) + ' domajnoj';
+ }
+ });
} else {
let cs = (function () {
let s = document.createElement('style');
@@ -34,29 +63,42 @@ if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lw
cs.insertRule("img[data-mitm=y]{cursor:not-allowed !important;border:2px red dotted !important}", 4);
cs.insertRule("img[data-mitm=y]:hover{filter:sepia(20%)}", 5);
}
- browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => {
+ browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg']).then(g => {
let asked = ['', 'searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lwy6ps54yd.onion', 'searxes.eu.org', 'api.searxes.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
if (g.ign1 == 'y') {
asked.push(location.hostname);
}
let qstall = (g.ign2 == 'y') ? 'a[href]:not([data-mitm])' : 'a[href]:not([data-mitm]),img[src]:not([data-mitm])';
+ let running = false;
function scanme() {
- if (location.hostname == 'twitter.com') {
- document.querySelectorAll("a[href^='https://t.co/'][data-expanded-url^='http']").forEach(a => {
- a.href = a.dataset.expandedUrl;
- });
- }
- document.querySelectorAll(qstall).forEach(a => {
- let aF = (a.tagName == 'A' ? (new URL(a.href)).hostname : (new URL(a.src)).hostname) || '';
- if (!asked.includes(aF) && !/^(.*)\.(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.push(aF);
- browser.runtime.sendMessage(aF);
+ if (!running) {
+ running = true;
+ if (location.hostname == 'twitter.com') {
+ document.querySelectorAll("a[href^='https://t.co/'][data-expanded-url^='http']").forEach(a => {
+ a.href = a.dataset.expandedUrl;
+ });
}
- });
+ let unknown = [];
+ document.querySelectorAll(qstall).forEach(a => {
+ let aF = (a.tagName == 'A' ? (new URL(a.href)).hostname : (new URL(a.src)).hostname) || '';
+ if (!asked.includes(aF)) {
+ asked.push(aF);
+ 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)) {
+ unknown.push(aF);
+ }
+ }
+ });
+ unknown.forEach(a => {
+ browser.runtime.sendMessage(a);
+ });
+ running = false;
+ }
}
- scanme();
browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
if (request.length == 2) {
+ if (g.dbg == 'y') {
+ console.log('isMITM:', request[0], request[1]);
+ }
document.querySelectorAll(qstall).forEach(a => {
let aF = (a.tagName == 'A' ? (new URL(a.href)).hostname : (new URL(a.src)).hostname) || '';
if (aF == request[0]) {
@@ -70,12 +112,16 @@ if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lw
});
}
sendResponse(null);
+ return;
});
+ scanme();
if (g.obs == 'y') {
- (new MutationObserver(scanme)).observe(document, {
- attributes: true,
- childList: true,
- subtree: true
+ window.addEventListener('load', function () {
+ (new MutationObserver(scanme)).observe(document, {
+ attributes: true,
+ childList: true,
+ subtree: true
+ });
});
}
});
diff --git a/addon_firefox/ismitmlink/manifest.json b/addon_firefox/ismitmlink/manifest.json
index 550985f3a..f503ce2c1 100644
--- a/addon_firefox/ismitmlink/manifest.json
+++ b/addon_firefox/ismitmlink/manifest.json
@@ -1,8 +1,8 @@
{
"manifest_version": 2,
- "name": "Are links vulnerable to MITM attack?",
+ "name": "Ĉu ligoj estas vundeblaj al MITM-atako?",
"description": "Skanu FQDN uzante la API de Searxes",
- "version": "1.0.13",
+ "version": "1.0.14.1",
"homepage_url": "https://codeberg.org/crimeflare/cloudflare-tor",
"author": "Maslin Bossé",
"permissions": [