From aa6c43eca5642a6ab1c837ef06c0017c2d44b50f Mon Sep 17 00:00:00 2001 From: Stephen Krings <03f2fe2a7c02892ebf25a037ceb6a004f6e7b084@cloudflare.com> Date: Tue, 10 Nov 2020 08:40:31 +0100 Subject: [PATCH] bg.js --- addons/isattlinkFX/bg.js | 68 +++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/addons/isattlinkFX/bg.js b/addons/isattlinkFX/bg.js index 50e7e583..449d0caf 100644 --- a/addons/isattlinkFX/bg.js +++ b/addons/isattlinkFX/bg.js @@ -2,31 +2,7 @@ let localUse = false, localDB = [], timr, memcache = {}, forcePurge = false, - apiurl = 'http://api.wodferndripvpe6ib4uz4rtngrnzichnirgn7t5x64gxcyroopbhsuqd.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(() => {}); - } - } -}); -*/ + apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php'; 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) {