diff --git a/addon_firefox/ismitmlink/bg.js b/addon_firefox/ismitmlink/bg.js index a8e8ddf..af20d0e 100644 --- a/addon_firefox/ismitmlink/bg.js +++ b/addon_firefox/ismitmlink/bg.js @@ -48,25 +48,47 @@ function i_already_know_you(f) { }); } -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 +function forget_cache_1w() { + browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => { + browser.storage.local.clear(); + browser.storage.local.set({ + 'ign1': (g.ign1 == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'ign2': (g.ign2 == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'obs': (g.obs == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'lastU': Math.round((new Date()).getTime() / 1000) + }); + browser.storage.local.set({ + 'lastV': (browser.runtime.getManifest()).version + }); }); setTimeout(function () { - clear_cache_1w(); + forget_cache_1w(); }, 604800000); } 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.clear(); - browser.storage.local.set({ - 'lastU': Math.round((new Date()).getTime() / 1000) + browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => { + browser.storage.local.clear(); + browser.storage.local.set({ + 'ign1': (g.ign1 == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'ign2': (g.ign2 == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'obs': (g.obs == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'lastU': Math.round((new Date()).getTime() / 1000) + }); }); } } else { @@ -77,16 +99,27 @@ 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.clear(); - browser.storage.local.set({ - 'lastU': Math.round((new Date()).getTime() / 1000) - }); - browser.storage.local.set({ - 'lastV': nowVer + browser.storage.local.get(['ign1', 'ign2', 'obs']).then(g => { + browser.storage.local.clear(); + browser.storage.local.set({ + 'ign1': (g.ign1 == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'ign2': (g.ign2 == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'obs': (g.obs == 'y' ? 'y' : 'n') + }); + browser.storage.local.set({ + 'lastU': Math.round((new Date()).getTime() / 1000) + }); + browser.storage.local.set({ + 'lastV': (browser.runtime.getManifest()).version + }); }); } setTimeout(function () { - clear_cache_1w(); + forget_cache_1w(); }, 604800000); }); diff --git a/addon_firefox/ismitmlink/cfg.html b/addon_firefox/ismitmlink/cfg.html new file mode 100644 index 0000000..c8c9f9b --- /dev/null +++ b/addon_firefox/ismitmlink/cfg.html @@ -0,0 +1,8 @@ + + +
+
+
+ + + \ No newline at end of file diff --git a/addon_firefox/ismitmlink/cs.js b/addon_firefox/ismitmlink/cs.js index ae4aeae..534c090 100644 --- a/addon_firefox/ismitmlink/cs.js +++ b/addon_firefox/ismitmlink/cs.js @@ -1,41 +1,83 @@ if (document.body && !['searxes.nmqnkngye4ct7bgss4bmv5ca3wpa55yugvxen5kz2bbq67lwy6ps54yd.onion', 'searxes.eu.org', 'api.searxes.eu.org'].includes(location.hostname)) { - let cs = (function () { - let s = document.createElement('style'); - document.head.appendChild(s); - return s.sheet; - })(); - if (cs) { - cs.insertRule("a[data-mitm=y]{cursor:not-allowed !important;text-decoration-line:line-through !important;text-decoration-color:red !important;text-decoration-style:double !important}", 0); - cs.insertRule("a[data-mitm=y]::before{content:'[\\26A0]';font-weight:bold !important;color:red !important;display:inline-block !important}", 1); - cs.insertRule("a[data-mitm=y]:hover::before{content:'[\\26A1]'}", 2); - cs.insertRule("a[data-mitm=y]:hover{color:red !important}", 3); - 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); - } - - 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]:not([data-mitm]),img[src]:not([data-mitm])').forEach(a => { - let aF = (a.tagName == 'A' ? (new URL(a.href)).hostname : (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) { - document.querySelectorAll('a[href]:not([data-mitm]),img[src]:not([data-mitm])').forEach(a => { - let aF = (a.tagName == 'A' ? (new URL(a.href)).hostname : (new URL(a.src)).hostname) || ''; - if (aF == request[0]) { - if (request[1]) { - a.dataset.mitm = 'y'; - a.title = 'MITM!'; - } else { - a.dataset.mitm = 'n'; - } - } + if (location.protocol === 'moz-extension:' && location.pathname === '/cfg.html') { + browser.storage.local.get(['ign1', 'ign2', 'obs']).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('ign1').addEventListener('click', () => { + browser.storage.local.set({ + 'ign1': (document.getElementById('ign1').checked ? 'y' : 'n') }); + }); + document.getElementById('ign2').addEventListener('click', () => { + browser.storage.local.set({ + 'ign2': (document.getElementById('ign2').checked ? 'y' : 'n') + }); + }); + document.getElementById('obs').addEventListener('click', () => { + browser.storage.local.set({ + 'obs': (document.getElementById('obs').checked ? 'y' : 'n') + }); + }); + } else { + let cs = (function () { + let s = document.createElement('style'); + document.head.appendChild(s); + return s.sheet; + })(); + if (cs) { + cs.insertRule("a[data-mitm=y]{cursor:not-allowed !important;text-decoration-line:line-through !important;text-decoration-color:red !important;text-decoration-style:double !important}", 0); + cs.insertRule("a[data-mitm=y]::before{content:'[\\26A0]';font-weight:bold !important;color:red !important;display:inline-block !important}", 1); + cs.insertRule("a[data-mitm=y]:hover::before{content:'[\\26A1]'}", 2); + cs.insertRule("a[data-mitm=y]:hover{color:red !important}", 3); + 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); } - sendResponse(null); - }); + browser.storage.local.get(['ign1', 'ign2', 'obs']).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])'; + 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); + } + }); + } + scanme(); + browser.runtime.onMessage.addListener((request, sender, sendResponse) => { + if (request.length == 2) { + document.querySelectorAll(qstall).forEach(a => { + let aF = (a.tagName == 'A' ? (new URL(a.href)).hostname : (new URL(a.src)).hostname) || ''; + if (aF == request[0]) { + if (request[1]) { + a.dataset.mitm = 'y'; + a.title = 'MITM!'; + } else { + a.dataset.mitm = 'n'; + } + } + }); + } + sendResponse(null); + }); + if (g.obs == 'y') { + (new MutationObserver(scanme)).observe(document, { + attributes: true, + childList: true, + subtree: true + }); + } + }); + } } \ No newline at end of file diff --git a/addon_firefox/ismitmlink/manifest.json b/addon_firefox/ismitmlink/manifest.json index b1a1a8e..550985f 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?", - "description": "Scan FQDN using Searxes' API", - "version": "1.0.12", + "description": "Skanu FQDN uzante la API de Searxes", + "version": "1.0.13", "homepage_url": "https://codeberg.org/crimeflare/cloudflare-tor", "author": "Maslin Bossé", "permissions": [ @@ -29,6 +29,10 @@ "run_at": "document_end" } ], + "options_ui": { + "browser_style": true, + "page": "cfg.html" + }, "applications": { "gecko": { "id": "ismitmlink@searxes.danwin1210.me",