README.md

addons/bcmaCR/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.4.4_
+Versio: _1.0.4.6_
 
 [//]: # (do not edit me; end)
 

addons/bcmaCR/cg.html

@@ -146,7 +146,7 @@
       &nbsp;<br>&nbsp;<br>
       <b>&#128218; <span transk="useflik"></span></b><br>
       <ul>
-         <li><a href="https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/ss/tool_ismitm.php" target="_blank"><span transk="tsmitm"></span></a></li>
+         <li><a href="https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/ss/tool_ismitm.php" target="_blank"><span transk="tsmitm"></span></a></li>
          <li><a href="https://codeberg.org/crimeflare/cloudflare-tor" target="_blank">"The Great Cloudwall"</a></li>
       </ul>
       &nbsp;<br>

addons/bcmaCR/manifest.json

@@ -1,9 +1,9 @@
 {
    "manifest_version": 2,
    "name": "Bloku Cloudflaron MITM-Atakon",
-   "version": "1.0.4.4",
+   "version": "1.0.4.6",
-   "minimum_chrome_version": "68",
+   "minimum_chrome_version": "78",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "incognito": "split",
    "permissions": [

addons/bcmaFX/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.4.4_
+Versio: _1.0.4.6_
 
 [//]: # (do not edit me; end)
 

addons/bcmaFX/cg.html

@@ -146,7 +146,7 @@
       &nbsp;<br>&nbsp;<br>
       <b>&#128218; <span transk="useflik"></span></b><br>
       <ul>
-         <li><a href="https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/ss/tool_ismitm.php" target="_blank"><span transk="tsmitm"></span></a></li>
+         <li><a href="https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/ss/tool_ismitm.php" target="_blank"><span transk="tsmitm"></span></a></li>
          <li><a href="https://codeberg.org/crimeflare/cloudflare-tor" target="_blank">"The Great Cloudwall"</a></li>
       </ul>
       &nbsp;<br>

addons/bcmaFX/manifest.json

@@ -1,9 +1,9 @@
 {
    "manifest_version": 2,
    "name": "Bloku Cloudflaron MITM-Atakon",
-   "description": "Submetiĝu al tutmonda gvatado aŭ rezistu. La elekto estas via.",
+   "description": "Submetiĝu al tutmonda gvatado aŭ rezistu",
-   "version": "1.0.4.4",
+   "version": "1.0.4.6",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "permissions": [
       "<all_urls>",
@@ -49,8 +49,8 @@
    "applications": {
       "gecko": {
          "id": "bcma@searxes.eu.org",
-         "strict_min_version": "68.0",
+         "strict_min_version": "78.0",
-         "update_url": "https://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/addon.php?for=bcma"
+         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=bcma"
       }
    }
 }

addons/isattlinkCR/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.2.6_
+Versio: _1.0.3.1_
 
 [//]: # (do not edit me; end)
 

addons/isattlinkCR/bg.js

@@ -2,31 +2,7 @@ let localUse = false,
 	localDB = [],
 	timr, memcache = {},
 	forcePurge = false,
-	apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/is_antitor.php';
+	apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
-/*
-chrome.storage.local.get(['cep'], g => {
-	if (g.cep == 'y') {
-		apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/is_antitor.php';
-	} else {
-		if (g.cep != 'n') {
-			chrome.storage.local.set({
-				'cep': 'n'
-			});
-			fetch('http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ok.php', {
-				method: 'GET',
-				mode: 'cors'
-			}).then(r => r.text()).then(r => {
-				if (r == 'ok') {
-					apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/is_antitor.php';
-					chrome.storage.local.set({
-						'cep': 'y'
-					});
-				}
-			}).catch(() => {});
-		}
-	}
-});
-*/
 function is_hostile(f) {
 	if (localUse) {
 		return new Promise((g, b) => {
@@ -96,7 +72,7 @@ function forget_cache() {
 			'alt': (g.alt == 'y' ? 'y' : 'n')
 		});
 		chrome.storage.local.set({
-			'cep': (g.cep == 'y' ? 'y' : 'n')
+			'cep': (g.cep != undefined ? g.cep : '2')
 		});
 		chrome.storage.local.set({
 			'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -119,9 +95,20 @@ function forget_cache() {
 		forget_cache();
 	}, 1814400000);
 }
-chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], g => {
+chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep'], g => {
 	localUse = (g.opd == 'n') ? true : false;
 	localDB = JSON.parse(g.ldb || '[]');
+	switch (g.cep) {
+		case '1':
+			apiurl = 'https://api.crimeflare.eu.org/_/is_antitor.php';
+			break;
+		case '2':
+			apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_at.php';
+			break;
+		default:
+			apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
+			break;
+	}
 	if (g.lastU) {
 		if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 1814400) {
 			chrome.storage.local.get(['ign1', 'obs', 'dbg', 'alt', 'cep', 'mul', 'opd', 'ldb'], g => {
@@ -140,7 +127,7 @@ chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], g => {
 					'alt': (g.alt == 'y' ? 'y' : 'n')
 				});
 				chrome.storage.local.set({
-					'cep': (g.cep == 'y' ? 'y' : 'n')
+					'cep': (g.cep != undefined ? g.cep : '2')
 				});
 				chrome.storage.local.set({
 					'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -179,7 +166,7 @@ chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], g => {
 				'alt': (g.alt == 'y' ? 'y' : 'n')
 			});
 			chrome.storage.local.set({
-				'cep': (g.cep == 'y' ? 'y' : 'n')
+				'cep': (g.cep != undefined ? g.cep : '2')
 			});
 			chrome.storage.local.set({
 				'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -236,6 +223,29 @@ chrome.runtime.onMessage.addListener((requests, sender, sendResponse) => {
 			}
 			return;
 		}
+		if (requests.indexOf('urltype,') === 0) {
+			switch (requests) {
+				case 'urltype,0':
+					chrome.storage.local.set({
+						'cep': '0'
+					});
+					apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
+					break;
+				case 'urltype,1':
+					chrome.storage.local.set({
+						'cep': '1'
+					});
+					apiurl = 'https://api.crimeflare.eu.org/_/is_antitor.php';
+					break;
+				case 'urltype,2':
+					chrome.storage.local.set({
+						'cep': '2'
+					});
+					apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_at.php';
+					break;
+			}
+			return;
+		}
 		requests.forEach(request => {
 			i_know_you(request).then((r) => {
 				if (r == 1 || r == -1) {

addons/isattlinkCR/cfg.html

@@ -10,7 +10,10 @@
       <label><input type="checkbox" id="dbg" disabled> <span tek="tldbg"></span></label><br>
       <br>&nbsp;<br>
       <span tek="opmode"></span><br>
-      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut0"> api.~.onion</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut1"> api.crimeflare.eu.org</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label><br>
       <label><input type="radio" name="opm" id="opoff"> <span tek="opmoff"></span></label>  [ &rarr; <a href="./localdb.html" target="_blank"><span tek="opmode"></span></a> ]<br>
       <br>&nbsp;<br>
       &#128172; 

addons/isattlinkCR/cg.js

@@ -1,10 +1,27 @@
 document.addEventListener('DOMContentLoaded', () => {
-	chrome.storage.local.get(['ign1', 'obs', 'dbg', 'alt', 'mul', 'opd'], g => {
+	chrome.storage.local.get(['ign1', 'obs', 'dbg', 'alt', 'mul', 'opd', 'cep'], g => {
 		document.getElementById('ign1').checked = (g.ign1 == 'y') ? true : false;
 		document.getElementById('obs').checked = (g.obs == 'y') ? true : false;
 		document.getElementById('alt').checked = (g.alt == 'y') ? true : false;
 		document.getElementById('opon').checked = (g.opd != 'n') ? true : false;
 		document.getElementById('opoff').checked = (g.opd == 'n') ? true : false;
+		switch (g.cep) {
+			case '1':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = true;
+				document.getElementById('ut2').checked = false;
+				break;
+			case '2':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = true;
+				break;
+			default:
+				document.getElementById('ut0').checked = true;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = false;
+				break;
+		}
 		let ul = g.mul || 'eo';
 		fetch('i18n/' + ul + '.json', {
 			method: 'GET'
@@ -55,6 +72,21 @@ document.getElementById('crs').addEventListener('click', () => {
 		location.reload();
 	});
 });
+document.getElementById('ut0').addEventListener('click', () => {
+	chrome.runtime.sendMessage('urltype,0', () => {
+		location.reload();
+	});
+});
+document.getElementById('ut1').addEventListener('click', () => {
+	chrome.runtime.sendMessage('urltype,1', () => {
+		location.reload();
+	});
+});
+document.getElementById('ut2').addEventListener('click', () => {
+	chrome.runtime.sendMessage('urltype,2', () => {
+		location.reload();
+	});
+});
 document.getElementById('sms').addEventListener('click', () => {
 	document.getElementById('smsa').style.display = 'none';
 	chrome.storage.local.get(null, g => {

addons/isattlinkCR/cs.js

@@ -1,4 +1,4 @@
-if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org'].includes(location.hostname)) {
+if (document.body && !['crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.eu.org'].includes(location.hostname) && !location.hostname.endsWith('.onion')) {
 	let cs = (function () {
 		let s = document.createElement('style');
 		document.head.appendChild(s);
@@ -1067,7 +1067,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 			return wa[1] + '.' + wa[0];
 		}
 		let bdom = get_realdomain(location.hostname),
-			asked = ['', 'crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
+			asked = ['', 'cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
 		if (g.ign1 == 'y') {
 			asked.push(location.hostname);
 		}
@@ -1081,7 +1081,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 					a.dataset.iatt = aF;
 					if (!asked.includes(aF)) {
 						asked.push(aF);
-						if (!/^(.*)\.(danwin1210\.me|wikipedia\.org|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) && get_realdomain(aF) != bdom && aF.length >= 4) {
+						if (!/^(.*)\.(wikipedia\.org|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) && get_realdomain(aF) != bdom && aF.length >= 4) {
 							unknown.push(aF);
 						}
 					}

addons/isattlinkCR/manifest.json

@@ -1,9 +1,9 @@
 {
    "manifest_version": 2,
    "name": "Ĉu ĉi tiuj ligoj blokos Tor-uzanton?",
-   "version": "1.0.2.6",
+   "version": "1.0.3.1",
-   "minimum_chrome_version": "68",
+   "minimum_chrome_version": "78",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "incognito": "split",
    "permissions": [

addons/isattlinkFX/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.2.6_
+Versio: _1.0.3.1_
 
 [//]: # (do not edit me; end)
 

addons/isattlinkFX/bg.js

@@ -2,31 +2,7 @@ let localUse = false,
 	localDB = [],
 	timr, memcache = {},
 	forcePurge = false,
-	apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/is_antitor.php';
+	apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
-/*
-browser.storage.local.get(['cep']).then(g => {
-	if (g.cep == 'y') {
-		apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/is_antitor.php';
-	} else {
-		if (g.cep != 'n') {
-			browser.storage.local.set({
-				'cep': 'n'
-			});
-			fetch('http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ok.php', {
-				method: 'GET',
-				mode: 'cors'
-			}).then(r => r.text()).then(r => {
-				if (r == 'ok') {
-					apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/is_antitor.php';
-					browser.storage.local.set({
-						'cep': 'y'
-					});
-				}
-			}).catch(() => {});
-		}
-	}
-});
-*/
 function is_hostile(f) {
 	if (localUse) {
 		return new Promise((g, b) => {
@@ -98,7 +74,7 @@ function forget_cache() {
 			'alt': (g.alt == 'y' ? 'y' : 'n')
 		});
 		browser.storage.local.set({
-			'cep': (g.cep == 'y' ? 'y' : 'n')
+			'cep': (g.cep != undefined ? g.cep : '2')
 		});
 		browser.storage.local.set({
 			'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -121,9 +97,20 @@ function forget_cache() {
 		forget_cache();
 	}, 1814400000);
 }
-browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
+browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 	localUse = (g.opd == 'n') ? true : false;
 	localDB = JSON.parse(g.ldb || '[]');
+	switch (g.cep) {
+		case '1':
+			apiurl = 'https://api.crimeflare.eu.org/_/is_antitor.php';
+			break;
+		case '2':
+			apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_at.php';
+			break;
+		default:
+			apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
+			break;
+	}
 	if (g.lastU) {
 		if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 1814400) {
 			browser.storage.local.get(['ign1', 'obs', 'dbg', 'alt', 'cep', 'mul', 'opd', 'ldb']).then(g => {
@@ -142,7 +129,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
 					'alt': (g.alt == 'y' ? 'y' : 'n')
 				});
 				browser.storage.local.set({
-					'cep': (g.cep == 'y' ? 'y' : 'n')
+					'cep': (g.cep != undefined ? g.cep : '2')
 				});
 				browser.storage.local.set({
 					'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -182,7 +169,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
 				'alt': (g.alt == 'y' ? 'y' : 'n')
 			});
 			browser.storage.local.set({
-				'cep': (g.cep == 'y' ? 'y' : 'n')
+				'cep': (g.cep != undefined ? g.cep : '2')
 			});
 			browser.storage.local.set({
 				'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -239,6 +226,29 @@ browser.runtime.onMessage.addListener((requests, sender, sendResponse) => {
 			}
 			return;
 		}
+		if (requests.indexOf('urltype,') === 0) {
+			switch (requests) {
+				case 'urltype,0':
+					browser.storage.local.set({
+						'cep': '0'
+					});
+					apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
+					break;
+				case 'urltype,1':
+					browser.storage.local.set({
+						'cep': '1'
+					});
+					apiurl = 'https://api.crimeflare.eu.org/_/is_antitor.php';
+					break;
+				case 'urltype,2':
+					browser.storage.local.set({
+						'cep': '2'
+					});
+					apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_at.php';
+					break;
+			}
+			return;
+		}
 		requests.forEach(request => {
 			i_know_you(request).then((r) => {
 				if (r == 1 || r == -1) {

addons/isattlinkFX/cfg.html

@@ -10,7 +10,10 @@
       <label><input type="checkbox" id="dbg"> <span tek="tldbg"></span></label><br>
       <br>&nbsp;<br>
       <span tek="opmode"></span><br>
-      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut0"> api.~.onion</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut1"> api.crimeflare.eu.org</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label><br>
       <label><input type="radio" name="opm" id="opoff"> <span tek="opmoff"></span></label>  [ &rarr; <a href="./localdb.html" target="_blank"><span tek="opmode"></span></a> ]<br>
       <br>&nbsp;<br>
       &#128172; 

addons/isattlinkFX/cg.js

@@ -1,11 +1,28 @@
 document.addEventListener('DOMContentLoaded', () => {
-	browser.storage.local.get(['ign1', 'obs', 'dbg', 'alt', 'mul', 'opd']).then(g => {
+	browser.storage.local.get(['ign1', 'obs', 'dbg', 'alt', 'mul', 'opd', 'cep']).then(g => {
 		document.getElementById('ign1').checked = (g.ign1 == 'y') ? true : false;
 		document.getElementById('obs').checked = (g.obs == 'y') ? true : false;
 		document.getElementById('dbg').checked = (g.dbg == 'y') ? true : false;
 		document.getElementById('alt').checked = (g.alt == 'y') ? true : false;
 		document.getElementById('opon').checked = (g.opd != 'n') ? true : false;
 		document.getElementById('opoff').checked = (g.opd == 'n') ? true : false;
+		switch (g.cep) {
+			case '1':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = true;
+				document.getElementById('ut2').checked = false;
+				break;
+			case '2':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = true;
+				break;
+			default:
+				document.getElementById('ut0').checked = true;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = false;
+				break;
+		}
 		let ul = g.mul || 'eo';
 		fetch('i18n/' + ul + '.json', {
 			method: 'GET'
@@ -61,6 +78,21 @@ document.getElementById('crs').addEventListener('click', () => {
 		location.reload();
 	});
 });
+document.getElementById('ut0').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,0').then(() => {
+		location.reload();
+	});
+});
+document.getElementById('ut1').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,1').then(() => {
+		location.reload();
+	});
+});
+document.getElementById('ut2').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,2').then(() => {
+		location.reload();
+	});
+});
 document.getElementById('sms').addEventListener('click', () => {
 	document.getElementById('smsa').style.display = 'none';
 	browser.storage.local.get().then(g => {

addons/isattlinkFX/cs.js

@@ -1,4 +1,4 @@
-if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org'].includes(location.hostname)) {
+if (document.body && !['crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.eu.org'].includes(location.hostname) && !location.hostname.endsWith('.onion')) {
 	let cs = (function () {
 		let s = document.createElement('style');
 		document.head.appendChild(s);
@@ -1067,7 +1067,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 			return wa[1] + '.' + wa[0];
 		}
 		let bdom = get_realdomain(location.hostname),
-			asked = ['', 'crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
+			asked = ['', 'cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
 		if (g.ign1 == 'y') {
 			asked.push(location.hostname);
 		}
@@ -1081,7 +1081,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 					a.dataset.iatt = aF;
 					if (!asked.includes(aF)) {
 						asked.push(aF);
-						if (!/^(.*)\.(danwin1210\.me|wikipedia\.org|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) && get_realdomain(aF) != bdom && aF.length >= 4) {
+						if (!/^(.*)\.(wikipedia\.org|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) && get_realdomain(aF) != bdom && aF.length >= 4) {
 							unknown.push(aF);
 						}
 					}

addons/isattlinkFX/manifest.json

@@ -2,8 +2,8 @@
    "manifest_version": 2,
    "name": "Ĉu ĉi tiuj ligoj blokos Tor-uzanton?",
    "description": "Skanu FQDN uzante la API",
-   "version": "1.0.2.6",
+   "version": "1.0.3.1",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "permissions": [
       "storage",
@@ -36,8 +36,8 @@
    "applications": {
       "gecko": {
          "id": "torwatch@searxes.eu.org",
-         "strict_min_version": "68.0",
+         "strict_min_version": "78.0",
-         "update_url": "https://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/addon.php?for=isattlink"
+         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=isattlink"
       }
    }
 }

addons/ismitmlinkCR/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.21_
+Versio: _1.0.22.1_
 
 [//]: # (do not edit me; end)
 

addons/ismitmlinkCR/bg.js

@@ -2,31 +2,7 @@ let localUse = -1,
 	localDB = [],
 	timr, memcache = {},
 	forcePurge = false,
-	apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ismitm.php';
+	apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/ismitm.php';
-/*
-chrome.storage.local.get(['cep'], g => {
-	if (g.cep == 'y') {
-		apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ismitm.php';
-	} else {
-		if (g.cep != 'n') {
-			chrome.storage.local.set({
-				'cep': 'n'
-			});
-			fetch('http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ok.php', {
-				method: 'GET',
-				mode: 'cors'
-			}).then(r => r.text()).then(r => {
-				if (r == 'ok') {
-					apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ismitm.php';
-					chrome.storage.local.set({
-						'cep': 'y'
-					});
-				}
-			}).catch(() => {});
-		}
-	}
-});
-*/
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;
@@ -1163,7 +1139,7 @@ function forget_cache() {
 			'alt': (g.alt == 'y' ? 'y' : 'n')
 		});
 		chrome.storage.local.set({
-			'cep': (g.cep == 'y' ? 'y' : 'n')
+			'cep': (g.cep != undefined ? g.cep : '2')
 		});
 		chrome.storage.local.set({
 			'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -1186,7 +1162,7 @@ function forget_cache() {
 		forget_cache();
 	}, 1814400000);
 }
-chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], (g) => {
+chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep'], (g) => {
 	switch (g.opd) {
 		case 'n':
 			localUse = 1;
@@ -1198,6 +1174,17 @@ chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], (g) => {
 			localUse = -1;
 			break;
 	}
+	switch (g.cep) {
+		case '1':
+			apiurl = 'https://api.crimeflare.eu.org/_/ismitm.php';
+			break;
+		case '2':
+			apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_cf.php';
+			break;
+		default:
+			apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/ismitm.php';
+			break;
+	}
 	localDB = JSON.parse(g.ldb || '[]');
 	if (g.lastU) {
 		if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 1814400) {
@@ -1220,7 +1207,7 @@ chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], (g) => {
 					'alt': (g.alt == 'y' ? 'y' : 'n')
 				});
 				chrome.storage.local.set({
-					'cep': (g.cep == 'y' ? 'y' : 'n')
+					'cep': (g.cep != undefined ? g.cep : '2')
 				});
 				chrome.storage.local.set({
 					'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -1262,7 +1249,7 @@ chrome.storage.local.get(['lastU', 'lastV', 'ldb', 'opd'], (g) => {
 				'alt': (g.alt == 'y' ? 'y' : 'n')
 			});
 			chrome.storage.local.set({
-				'cep': (g.cep == 'y' ? 'y' : 'n')
+				'cep': (g.cep != undefined ? g.cep : '2')
 			});
 			chrome.storage.local.set({
 				'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -1353,6 +1340,29 @@ chrome.runtime.onMessage.addListener((requests, sender, sendResponse) => {
 			}
 			return;
 		}
+		if (requests.indexOf('urltype,') === 0) {
+			switch (requests) {
+				case 'urltype,0':
+					chrome.storage.local.set({
+						'cep': '0'
+					});
+					apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/ismitm.php';
+					break;
+				case 'urltype,1':
+					chrome.storage.local.set({
+						'cep': '1'
+					});
+					apiurl = 'https://api.crimeflare.eu.org/_/ismitm.php';
+					break;
+				case 'urltype,2':
+					chrome.storage.local.set({
+						'cep': '2'
+					});
+					apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_cf.php';
+					break;
+			}
+			return;
+		}
 		requests.forEach(request => {
 			i_know_you(request).then((r) => {
 				if (r == 1 || r == -1) {

addons/ismitmlinkCR/cfg.html

@@ -11,7 +11,10 @@
       <label><input type="checkbox" id="dbg" disabled> <span tek="tldbg"></span></label><br>
       <br>&nbsp;<br>
       <span tek="opmode"></span><br>
-      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut0"> api.~.onion</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut1"> api.crimeflare.eu.org</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label><br>
       <label><input type="radio" name="opm" id="opoff"> <span tek="opmoff"></span></label>  [ &rarr; <a href="./localdb.html" target="_blank"><span tek="opmode"></span></a> ]<br>
       <label><input type="radio" name="opm" id="opol"> <span tek="opmoff"></span></label>  (<span tek="opmlrn"></span>)<br>
       <br>&nbsp;<br>

addons/ismitmlinkCR/cg.js

@@ -1,5 +1,5 @@
 document.addEventListener('DOMContentLoaded', () => {
-	chrome.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt', 'mul', 'opd'], (g) => {
+	chrome.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt', 'mul', 'opd', 'cep'], (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;
@@ -7,6 +7,23 @@ document.addEventListener('DOMContentLoaded', () => {
 		document.getElementById('opon').checked = (g.opd != 'n' && g.opd != 'l') ? true : false;
 		document.getElementById('opoff').checked = (g.opd == 'n') ? true : false;
 		document.getElementById('opol').checked = (g.opd == 'l') ? true : false;
+		switch (g.cep) {
+			case '1':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = true;
+				document.getElementById('ut2').checked = false;
+				break;
+			case '2':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = true;
+				break;
+			default:
+				document.getElementById('ut0').checked = true;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = false;
+				break;
+		}
 		let ul = g.mul || 'eo';
 		fetch('i18n/' + ul + '.json', {
 			method: 'GET'
@@ -67,6 +84,21 @@ document.getElementById('crs').addEventListener('click', () => {
 		location.reload();
 	});
 });
+document.getElementById('ut0').addEventListener('click', () => {
+	chrome.runtime.sendMessage('urltype,0', () => {
+		location.reload();
+	});
+});
+document.getElementById('ut1').addEventListener('click', () => {
+	chrome.runtime.sendMessage('urltype,1', () => {
+		location.reload();
+	});
+});
+document.getElementById('ut2').addEventListener('click', () => {
+	chrome.runtime.sendMessage('urltype,2', () => {
+		location.reload();
+	});
+});
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;

addons/ismitmlinkCR/cs.js

@@ -1,4 +1,4 @@
-if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org'].includes(location.hostname)) {
+if (document.body && !['crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.eu.org'].includes(location.hostname) && !location.hostname.endsWith('.onion')) {
 	let cs = (function () {
 		let s = document.createElement('style');
 		document.head.appendChild(s);
@@ -13,7 +13,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 		cs.insertRule("img[data-mitm=y]:hover{filter:sepia(20%)}", 5);
 	}
 	chrome.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt'], (g) => {
-		let asked = ['', 'crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
+		let asked = ['', 'cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
 		if (g.ign1 == 'y') {
 			asked.push(location.hostname);
 		}
@@ -28,7 +28,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 					a.dataset.mitm = aF;
 					if (!asked.includes(aF)) {
 						asked.push(aF);
-						if (!/^(.*)\.(danwin1210\.me|wikipedia\.org|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) && aF.length >= 4) {
+						if (!/^(.*)\.(wikipedia\.org|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) && aF.length >= 4) {
 							unknown.push(aF);
 						}
 					}

addons/ismitmlinkCR/manifest.json

@@ -1,9 +1,9 @@
 {
    "manifest_version": 2,
    "name": "Ĉu ligoj estas vundeblaj al MITM-atako?",
-   "version": "1.0.21",
+   "version": "1.0.22.1",
-   "minimum_chrome_version": "68",
+   "minimum_chrome_version": "78",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "incognito": "split",
    "permissions": [

addons/ismitmlinkFX/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.21_
+Versio: _1.0.22.1_
 
 [//]: # (do not edit me; end)
 

addons/ismitmlinkFX/bg.js

@@ -2,31 +2,7 @@ let localUse = -1,
 	localDB = [],
 	timr, memcache = {},
 	forcePurge = false,
-	apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ismitm.php';
+	apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/ismitm.php';
-/*
-browser.storage.local.get(['cep']).then(g => {
-	if (g.cep == 'y') {
-		apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ismitm.php';
-	} else {
-		if (g.cep != 'n') {
-			browser.storage.local.set({
-				'cep': 'n'
-			});
-			fetch('http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ok.php', {
-				method: 'GET',
-				mode: 'cors'
-			}).then(r => r.text()).then(r => {
-				if (r == 'ok') {
-					apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/ismitm.php';
-					browser.storage.local.set({
-						'cep': 'y'
-					});
-				}
-			}).catch(() => {});
-		}
-	}
-});
-*/
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;
@@ -1165,7 +1141,7 @@ function forget_cache() {
 			'alt': (g.alt == 'y' ? 'y' : 'n')
 		});
 		browser.storage.local.set({
-			'cep': (g.cep == 'y' ? 'y' : 'n')
+			'cep': (g.cep != undefined ? g.cep : '2')
 		});
 		browser.storage.local.set({
 			'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -1188,7 +1164,7 @@ function forget_cache() {
 		forget_cache();
 	}, 1814400000);
 }
-browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
+browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 	switch (g.opd) {
 		case 'n':
 			localUse = 1;
@@ -1200,6 +1176,17 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
 			localUse = -1;
 			break;
 	}
+	switch (g.cep) {
+		case '1':
+			apiurl = 'https://api.crimeflare.eu.org/_/ismitm.php';
+			break;
+		case '2':
+			apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_cf.php';
+			break;
+		default:
+			apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/ismitm.php';
+			break;
+	}
 	localDB = JSON.parse(g.ldb || '[]');
 	if (g.lastU) {
 		if (Math.abs(Math.round((new Date()).getTime() / 1000) - g.lastU) > 1814400) {
@@ -1222,7 +1209,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
 					'alt': (g.alt == 'y' ? 'y' : 'n')
 				});
 				browser.storage.local.set({
-					'cep': (g.cep == 'y' ? 'y' : 'n')
+					'cep': (g.cep != undefined ? g.cep : '2')
 				});
 				browser.storage.local.set({
 					'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -1265,7 +1252,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd']).then(g => {
 				'alt': (g.alt == 'y' ? 'y' : 'n')
 			});
 			browser.storage.local.set({
-				'cep': (g.cep == 'y' ? 'y' : 'n')
+				'cep': (g.cep != undefined ? g.cep : '2')
 			});
 			browser.storage.local.set({
 				'mul': (g.mul != undefined ? g.mul : 'eo')
@@ -1356,6 +1343,29 @@ browser.runtime.onMessage.addListener((requests, sender, sendResponse) => {
 			}
 			return;
 		}
+		if (requests.indexOf('urltype,') === 0) {
+			switch (requests) {
+				case 'urltype,0':
+					browser.storage.local.set({
+						'cep': '0'
+					});
+					apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/ismitm.php';
+					break;
+				case 'urltype,1':
+					browser.storage.local.set({
+						'cep': '1'
+					});
+					apiurl = 'https://api.crimeflare.eu.org/_/ismitm.php';
+					break;
+				case 'urltype,2':
+					browser.storage.local.set({
+						'cep': '2'
+					});
+					apiurl = 'http://avrynpc2q7pknqa3ucf5tvjcwad5nxvxgwnzvl2b6dx6uo4f7nc7zzqd.onion/a/is_cf.php';
+					break;
+			}
+			return;
+		}
 		requests.forEach(request => {
 			i_know_you(request).then((r) => {
 				if (r == 1 || r == -1) {

addons/ismitmlinkFX/cfg.html

@@ -11,7 +11,10 @@
       <label><input type="checkbox" id="dbg"> <span tek="tldbg"></span></label><br>
       <br>&nbsp;<br>
       <span tek="opmode"></span><br>
-      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label>  [ &rarr; <a href="https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/#!op=info/api" target="_blank">Crimeflare API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut0"> api.~.onion</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut1"> api.crimeflare.eu.org</label><br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label><br>
       <label><input type="radio" name="opm" id="opoff"> <span tek="opmoff"></span></label>  [ &rarr; <a href="./localdb.html" target="_blank"><span tek="opmode"></span></a> ]<br>
       <label><input type="radio" name="opm" id="opol"> <span tek="opmoff"></span></label>  (<span tek="opmlrn"></span>)<br>
       <br>&nbsp;<br>

addons/ismitmlinkFX/cg.js

@@ -1,5 +1,5 @@
 document.addEventListener('DOMContentLoaded', () => {
-	browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt', 'mul', 'opd']).then(g => {
+	browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt', 'mul', 'opd', 'cep']).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;
@@ -8,6 +8,23 @@ document.addEventListener('DOMContentLoaded', () => {
 		document.getElementById('opon').checked = (g.opd != 'n' && g.opd != 'l') ? true : false;
 		document.getElementById('opoff').checked = (g.opd == 'n') ? true : false;
 		document.getElementById('opol').checked = (g.opd == 'l') ? true : false;
+		switch (g.cep) {
+			case '1':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = true;
+				document.getElementById('ut2').checked = false;
+				break;
+			case '2':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = true;
+				break;
+			default:
+				document.getElementById('ut0').checked = true;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = false;
+				break;
+		}
 		let ul = g.mul || 'eo';
 		fetch('i18n/' + ul + '.json', {
 			method: 'GET'
@@ -73,6 +90,21 @@ document.getElementById('crs').addEventListener('click', () => {
 		location.reload();
 	});
 });
+document.getElementById('ut0').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,0').then(() => {
+		location.reload();
+	});
+});
+document.getElementById('ut1').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,1').then(() => {
+		location.reload();
+	});
+});
+document.getElementById('ut2').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,2').then(() => {
+		location.reload();
+	});
+});
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;

addons/ismitmlinkFX/cs.js

@@ -1,4 +1,4 @@
-if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org'].includes(location.hostname)) {
+if (document.body && !['crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.eu.org'].includes(location.hostname) && !location.hostname.endsWith('.onion')) {
 	let cs = (function () {
 		let s = document.createElement('style');
 		document.head.appendChild(s);
@@ -13,7 +13,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 		cs.insertRule("img[data-mitm=y]:hover{filter:sepia(20%)}", 5);
 	}
 	browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt']).then(g => {
-		let asked = ['', 'crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
+		let asked = ['', 'cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'crimeflare.eu.org', 'api.crimeflare.eu.org', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
 		if (g.ign1 == 'y') {
 			asked.push(location.hostname);
 		}
@@ -28,7 +28,7 @@ if (document.body && !['crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxc
 					a.dataset.mitm = aF;
 					if (!asked.includes(aF)) {
 						asked.push(aF);
-						if (!/^(.*)\.(danwin1210\.me|wikipedia\.org|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) && aF.length >= 4) {
+						if (!/^(.*)\.(wikipedia\.org|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) && aF.length >= 4) {
 							unknown.push(aF);
 						}
 					}

addons/ismitmlinkFX/manifest.json

@@ -2,8 +2,8 @@
    "manifest_version": 2,
    "name": "Ĉu ligoj estas vundeblaj al MITM-atako?",
    "description": "Skanu FQDN uzante la API",
-   "version": "1.0.21",
+   "version": "1.0.22.1",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "permissions": [
       "storage",
@@ -38,8 +38,8 @@
    "applications": {
       "gecko": {
          "id": "ismitmlink@searxes.danwin1210.me",
-         "strict_min_version": "68.0",
+         "strict_min_version": "78.0",
-         "update_url": "https://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/addon.php?for=ismitmlink"
+         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=ismitmlink"
       }
    }
 }

addons/urejectCR/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.4_
+Versio: _1.0.4.1_
 
 [//]: # (do not edit me; end)
 

addons/urejectCR/bg.js

@@ -2,7 +2,7 @@ let history = {};
 chrome.webRequest.onResponseStarted.addListener(i => {
 	if ([403, 406, 410, 429, 451, 462].includes(i.statusCode)) {
 		let iFQDN = (new URL(i.url)).hostname;
-		if (['crimeflare.eu.org', 'ansero.eu.org', 'crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion'].includes(iFQDN)) {
+		if (['crimeflare.eu.org', 'ansero.eu.org', 'cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion'].includes(iFQDN)) {
 			return;
 		}
 		let iServer = '?';

addons/urejectCR/manifest.json

@@ -1,9 +1,9 @@
 {
    "manifest_version": 2,
    "name": "Kiu retejo malakceptis min?",
-   "version": "1.0.4",
+   "version": "1.0.4.1",
    "minimum_chrome_version": "60",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "incognito": "split",
    "permissions": [

addons/urejectFX/README.md

@@ -1,6 +1,6 @@
 [//]: # (do not edit me; start)
 
-Versio: _1.0.4_
+Versio: _1.0.4.1_
 
 [//]: # (do not edit me; end)
 

addons/urejectFX/bg.js

@@ -2,7 +2,7 @@ let history = {};
 browser.webRequest.onResponseStarted.addListener(i => {
 	if ([403, 406, 410, 429, 451, 462].includes(i.statusCode)) {
 		let iFQDN = (new URL(i.url)).hostname;
-		if (['crimeflare.eu.org', 'ansero.eu.org', 'crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion', 'ansero.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion'].includes(iFQDN)) {
+		if (['crimeflare.eu.org', 'ansero.eu.org', 'cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion'].includes(iFQDN)) {
 			return;
 		}
 		let iServer = '?';

addons/urejectFX/manifest.json

@@ -2,8 +2,8 @@
    "manifest_version": 2,
    "name": "Kiu retejo malakceptis min?",
    "description": "Via retejo malakceptis min, sed mi scias ke mi fartos bone.",
-   "version": "1.0.4",
+   "version": "1.0.4.1",
-   "homepage_url": "https://crimeflare.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/",
+   "homepage_url": "https://cfe.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/",
    "author": "Crimeflare",
    "permissions": [
       "storage",
@@ -33,7 +33,7 @@
       "gecko": {
          "id": "urejectme@searxes.eu.org",
          "strict_min_version": "68.0",
-         "update_url": "https://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.onion/_/addon.php?for=ureject"
+         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=ureject"
       }
    }
 }