From 754c52983a87523374573ca6f1885d98f790fc33 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 15 May 2022 20:27:28 +0300 Subject: Unchecked Authentication Requiring instances by default #248 --- src/instances/blocklist.json | 56 ++++++++++++++++++++++++++++++++++++++++++ src/instances/cloudflare.json | 55 ----------------------------------------- src/instances/data.json | 6 ++--- src/instances/get_instances.py | 22 +++++++++++++---- 4 files changed, 76 insertions(+), 63 deletions(-) create mode 100644 src/instances/blocklist.json delete mode 100644 src/instances/cloudflare.json (limited to 'src/instances') diff --git a/src/instances/blocklist.json b/src/instances/blocklist.json new file mode 100644 index 00000000..0e69e366 --- /dev/null +++ b/src/instances/blocklist.json @@ -0,0 +1,56 @@ +[ + "https://invidious.kavin.rocks", + "https://invidious.lunar.icu", + "https://piped.kavin.rocks", + "https://piped.silkky.cloud", + "https://piped.tokhmi.xyz", + "https://piped.moomoo.me", + "https://piped.syncpundit.com", + "https://piped.mha.fi", + "https://send.silkky.cloud", + "https://nhanh.cloud", + "https://nitter.nixnet.services", + "https://nitter.domain.glass", + "https://birdsite.xanny.family", + "https://nitter.moomoo.me", + "https://nitter.it", + "https://notabird.site", + "https://nitter.silkky.cloud", + "https://fuckthesacklers.network", + "https://nitter.govt.land", + "https://nitter.winscloud.net", + "https://twtr.bch.bar", + "https://nitter.lunar.icu", + "https://twitter.dr460nf1r3.org", + "https://bib.actionsack.com", + "https://libreddit.silkky.cloud", + "https://libreddit.domain.glass", + "https://libreddit.jamiethalacker.dev", + "https://r.nf", + "https://libreddit.flux.industries", + "https://lr.oversold.host", + "https://libreddit.hu", + "https://lr.stilic.ml", + "https://reddi.tk", + "https://r.walkx.org", + "https://libreddit.yonalee.eu", + "https://libreddit.winscloud.net", + "https://libreddit.lunar.icu", + "https://teddit.domain.glass", + "https://wiki.604kph.xyz", + "https://wikiless.lunar.icu", + "https://translate.syncpundit.com", + "https://lingva.lunar.icu", + "https://searx.josie.lol", + "https://searx.kujonello.cf", + "https://searx.org", + "https://searx.run", + "https://searx.tk", + "https://searx.albony.xyz", + "https://search.albony.xyz", + "https://search.garudalinux.org", + "https://search.dr460nf1r3.org", + "https://whoogle.lunar.icu", + "https://rimgo.lunar.icu", + "https://i.actionsack.com" +] \ No newline at end of file diff --git a/src/instances/cloudflare.json b/src/instances/cloudflare.json deleted file mode 100644 index 5424cc57..00000000 --- a/src/instances/cloudflare.json +++ /dev/null @@ -1,55 +0,0 @@ -[ - "https://invidious.kavin.rocks", - "https://invidious.lunar.icu", - "https://piped.kavin.rocks", - "https://piped.silkky.cloud", - "https://piped.tokhmi.xyz", - "https://piped.moomoo.me", - "https://piped.syncpundit.com", - "https://piped.mha.fi", - "https://send.silkky.cloud", - "https://nhanh.cloud", - "https://nitter.domain.glass", - "https://birdsite.xanny.family", - "https://nitter.moomoo.me", - "https://nitter.it", - "https://notabird.site", - "https://nitter.silkky.cloud", - "https://fuckthesacklers.network", - "https://nitter.govt.land", - "https://nitter.winscloud.net", - "https://twtr.bch.bar", - "https://nitter.lunar.icu", - "https://twitter.dr460nf1r3.org", - "https://bib.actionsack.com", - "https://libreddit.silkky.cloud", - "https://libreddit.domain.glass", - "https://libreddit.jamiethalacker.dev", - "https://r.nf", - "https://libreddit.flux.industries", - "https://lr.oversold.host", - "https://libreddit.hu", - "https://lr.stilic.ml", - "https://reddi.tk", - "https://r.walkx.org", - "https://libreddit.yonalee.eu", - "https://libreddit.winscloud.net", - "https://libreddit.lunar.icu", - "https://teddit.domain.glass", - "https://wiki.604kph.xyz", - "https://wikiless.lunar.icu", - "https://translate.syncpundit.com", - "https://lingva.lunar.icu", - "https://searx.josie.lol", - "https://searx.kujonello.cf", - "https://searx.org", - "https://searx.run", - "https://searx.tk", - "https://searx.albony.xyz", - "https://search.albony.xyz", - "https://search.garudalinux.org", - "https://search.dr460nf1r3.org", - "https://whoogle.lunar.icu", - "https://rimgo.lunar.icu", - "https://i.actionsack.com" -] \ No newline at end of file diff --git a/src/instances/data.json b/src/instances/data.json index d095e955..0cd02b7e 100644 --- a/src/instances/data.json +++ b/src/instances/data.json @@ -2,7 +2,6 @@ "invidious": { "normal": [ "https://yewtu.be", - "https://vid.puffyan.us", "https://invidious.snopyta.org", "https://invidious.kavin.rocks", "https://inv.riverside.rocks", @@ -19,7 +18,8 @@ "https://invidious.weblibre.org", "https://invidious.esmailelbob.xyz", "https://youtube.076.ne.jp", - "https://invidious.namazso.eu" + "https://invidious.namazso.eu", + "https://vid.puffyan.us" ], "tor": [ "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion", @@ -376,7 +376,6 @@ "https://searx.nixnet.services", "https://searx.openhoofd.nl", "https://searx.org", - "https://searx.ppeb.me", "https://searx.pwoss.org", "https://searx.rasp.fr", "https://searx.ru", @@ -444,6 +443,7 @@ "https://searx.mha.fi", "https://searx.namejeff.xyz", "https://searx.orion-hub.fr", + "https://searx.ppeb.me", "https://searx.prvcy.eu", "https://searx.sev.monster", "https://searx.tiekoetter.com", diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py index 7b62a9f7..facbca61 100644 --- a/src/instances/get_instances.py +++ b/src/instances/get_instances.py @@ -67,6 +67,16 @@ def is_cloudflare(url): return False +def is_authenticate(url): + try: + r = requests.get(url, timeout=5) + if 'www-authenticate' in r.headers: + return True + except: + return False + return False + + def invidious(): r = requests.get('https://api.invidious.io/instances.json') rJson = json.loads(r.text) @@ -366,7 +376,7 @@ searx_searxng() whoogle() rimgo() -cloudflareMightyList = [] +blocklist = [] for k1, v1 in mightyList.items(): if type(mightyList[k1]) is dict: for k2, v2 in mightyList[k1].items(): @@ -376,7 +386,9 @@ for k1, v1 in mightyList.items(): # print("removed " + instance) # else: if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance): - cloudflareMightyList.append(instance) + blocklist.append(instance) + if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_authenticate(instance): + blocklist.append(instance) peertube() @@ -387,9 +399,9 @@ with open('./src/instances/data.json', 'w') as outfile: outfile.write(json_object) print(Fore.BLUE + 'wrote ' + Style.RESET_ALL + 'instances/data.json') -json_object = json.dumps(cloudflareMightyList, ensure_ascii=False, indent=2) -with open('./src/instances/cloudflare.json', 'w') as outfile: +json_object = json.dumps(blocklist, ensure_ascii=False, indent=2) +with open('./src/instances/blocklist.json', 'w') as outfile: outfile.write(json_object) -print(Fore.BLUE + 'wrote ' + Style.RESET_ALL + 'instances/cloudflare.json') +print(Fore.BLUE + 'wrote ' + Style.RESET_ALL + 'instances/blocklist') # print(json_object) -- cgit 1.4.1