sim1222/fedi-block-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidying up results

Browse Source
This commit is contained in:
Mint 2022-09-09 11:43:55 +03:00
parent 719397e7b2
commit 80a1e77695
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fetch_blocks.py
View File

@ -178,6 +178,16 @@ def get_type(domain: str) -> str:
except:
return None
def tidyup(domain: str) -> str:
# some retards put their blocks in variable case
domain = domain.lower()
# other retards put the port
domain = re.sub("\:\d+$", "", domain)
# bigger retards put the schema in their blocklist, sometimes even without slashes
domain = re.sub("^https?\:(\/*)", "", domain)
# the biggest retards of them all try to block individual users
domain = re.sub("(.+)\@", "", domain)
return domain
conn = sqlite3.connect("blocks.db")
c = conn.cursor()
@ -187,6 +197,7 @@ c.execute(
)
for blocker, software in c.fetchall():
blocker = tidyup(blocker)
if software == "pleroma":
print(blocker)
try:
@ -200,10 +211,18 @@ for blocker, software in c.fetchall():
**{"quarantined_instances": federation["quarantined_instances"]}}
).items():
for blocked in blocks:
blocked = tidyup(blocked)
if blocked == "":
continue
blocked = blocked.lower()
blocker = blocker.lower()
if blocked.count("*") > 1:
# -ACK!-oma also started obscuring domains without hash
c.execute(
"select domain from instances where domain like ? order by rowid limit 1", (blocked.replace("*", "_"),)
)
searchres = c.fetchone()
if searchres != None:
blocked = searchres[0]
c.execute(
"select domain from instances where domain = ?", (blocked,)
)
@ -231,8 +250,7 @@ for blocker, software in c.fetchall():
else {})}
).items():
for blocked, reason in info.items():
blocker = blocker.lower()
blocked = blocked.lower()
blocked = tidyup(blocked)
c.execute(
"update blocks set reason = ? where blocker = ? and blocked = ? and block_level = ?",
(reason["reason"], blocker, blocked, block_level),
@ -247,8 +265,7 @@ for blocker, software in c.fetchall():
for block_level, blocks in json.items():
for instance in blocks:
blocked, blocked_hash, reason = instance.values()
blocked = blocked.lower()
blocker = blocker.lower()
blocked = tidyup(blocked)
if blocked.count("*") <= 1:
c.execute(
"select hash from instances where hash = ?", (blocked_hash,)
@ -258,6 +275,15 @@ for blocker, software in c.fetchall():
"insert into instances select ?, ?, ?",
(blocked, get_hash(blocked), get_type(blocked)),
)
else:
# Doing the hash search for instance names as well to tidy up DB
c.execute(
"select domain from instances where hash = ?", (blocked_hash,)
)
searchres = c.fetchone()
if searchres != None:
blocked = searchres[0]
c.execute(
"select * from blocks where blocker = ? and blocked = ? and block_level = ?",
(blocker, blocked if blocked.count("*") <= 1 else blocked_hash, block_level),
@ -285,8 +311,7 @@ for blocker, software in c.fetchall():
for block_level, blocks in json.items():
for instance in blocks:
blocked, reason = instance.values()
blocked = blocked.lower()
blocker = blocker.lower()
blocked = tidyup(blocked)
c.execute(
"select domain from instances where domain = ?", (blocked,)
)
@ -321,7 +346,6 @@ for blocker, software in c.fetchall():
).json()
for peer in federation:
blocked = peer["domain"].lower()
blocker = blocker.lower()
if blocked.count("*") > 0:
# GTS does not have hashes for obscured domains, so we have to guess it