import bs4
import itertools
import re
+import validators
import fba
fba.cursor.execute(
rows = fba.cursor.fetchall()
print(f"INFO: Checking {len(rows)} entries ...")
for blocker, software, origin, nodeinfo_url in rows:
- # NOISY-DEBUG: print("DEBUG: BEFORE blocker,software,origin,nodeinfo_url:", blocker, software, origin, nodeinfo_url)
+ # DEBUG: print("DEBUG: BEFORE blocker,software,origin,nodeinfo_url:", blocker, software, origin, nodeinfo_url)
blockdict = []
blocker = fba.tidyup(blocker)
- # NOISY-DEBUG: print("DEBUG: AFTER blocker,software:", blocker, software)
+ # DEBUG: print("DEBUG: AFTER blocker,software:", blocker, software)
if blocker == "":
print("WARNING: blocker is now empty!")
print(f"WARNING: blocker='{blocker}' is blacklisted now!")
continue
- # NOISY-DEBUG: print(f"DEBUG: blocker='{blocker}'")
+ # DEBUG: print(f"DEBUG: blocker='{blocker}'")
fba.update_last_blocked(blocker)
if software == "pleroma":
print("WARNING: Could not fetch nodeinfo from blocker:", blocker)
continue
- print("DEBUG: Updating nodeinfo:", blocker)
+ # DEBUG: print("DEBUG: Updating nodeinfo:", blocker)
fba.update_last_nodeinfo(blocker)
federation = json["metadata"]["federation"]
if "enabled" in federation:
- # NOISY-DEBUG: print("DEBUG: Instance has no block list to analyze:", blocker)
+ # DEBUG: print("DEBUG: Instance has no block list to analyze:", blocker)
continue
if "mrf_simple" in federation:
{**federation["mrf_simple"],
**{"quarantined_instances": federation["quarantined_instances"]}}
).items():
- # NOISY-DEBUG: print("DEBUG: block_level, blocks():", block_level, len(blocks))
+ # DEBUG: print("DEBUG: block_level, blocks():", block_level, len(blocks))
block_level = fba.tidyup(block_level)
- # NOISY-DEBUG: print("DEBUG: BEFORE block_level:", block_level)
+ # DEBUG: print("DEBUG: BEFORE block_level:", block_level)
if block_level == "":
print("WARNING: block_level is now empty!")
continue
for blocked in blocks:
- # NOISY-DEBUG: print("DEBUG: BEFORE blocked:", blocked)
+ # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
blocked = fba.tidyup(blocked)
- # NOISY-DEBUG: print("DEBUG: AFTER blocked:", blocked)
+ # DEBUG: print("DEBUG: AFTER blocked:", blocked)
if blocked == "":
print("WARNING: blocked is empty after fba.tidyup():", blocker, block_level)
continue
-
- if blocked.count("*") > 1:
+ elif fba.is_blacklisted(blocked):
+ # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
+ continue
+ elif blocked.count("*") > 1:
# -ACK!-oma also started obscuring domains without hash
fba.cursor.execute(
"SELECT domain, nodeinfo_url FROM instances WHERE domain LIKE ? ORDER BY rowid LIMIT 1", [blocked.replace("*", "_")]
)
searchres = fba.cursor.fetchone()
- # NOISY-DEBUG: print("DEBUG: searchres[]:", type(searchres))
+ # DEBUG: print("DEBUG: searchres[]:", type(searchres))
if searchres != None:
blocked = searchres[0]
nodeinfo_url = searchres[1]
- # NOISY-DEBUG: print("DEBUG: Looked up domain:", blocked)
+ # DEBUG: print("DEBUG: Looked up domain:", blocked)
+ elif not validators.domain(blocked):
+ print(f"WARNING: blocked='{blocked}' is not a valid domai name - skipped!")
+ continue
- # NOISY-DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
+ # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
if not fba.is_instance_registered(blocked):
- # NOISY-DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
+ # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
fba.add_instance(blocked, blocker, origin, nodeinfo_url)
fba.cursor.execute(
)
if fba.cursor.fetchone() == None:
- # NOISY-DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
+ # DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
fba.block_instance(blocker, blocked, "unknown", block_level)
if block_level == "reject":
- # NOISY-DEBUG: print("DEBUG: Adding to blockdict:", blocked)
+ # DEBUG: print("DEBUG: Adding to blockdict:", blocked)
blockdict.append(
{
"blocked": blocked,
"reason" : None
})
else:
- # NOISY-DEBUG: print("DEBUG: Updating last_seen:", blocker, blocked, block_level)
+ # DEBUG: print("DEBUG: Updating last_seen:", blocker, blocked, block_level)
fba.update_last_seen(blocker, blocked, block_level)
fba.connection.commit()
# Reasons
if "mrf_simple_info" in federation:
- # NOISY-DEBUG: print("DEBUG: Found mrf_simple_info:", blocker)
+ # DEBUG: print("DEBUG: Found mrf_simple_info:", blocker)
for block_level, info in (
{**federation["mrf_simple_info"],
**(federation["quarantined_instances_info"]
if "quarantined_instances_info" in federation
else {})}
).items():
- # NOISY-DEBUG: print("DEBUG: block_level, info.items():", block_level, len(info.items()))
+ # DEBUG: print("DEBUG: block_level, info.items():", block_level, len(info.items()))
block_level = fba.tidyup(block_level)
- # NOISY-DEBUG: print("DEBUG: BEFORE block_level:", block_level)
+ # DEBUG: print("DEBUG: BEFORE block_level:", block_level)
if block_level == "":
print("WARNING: block_level is now empty!")
continue
for blocked, reason in info.items():
- # NOISY-DEBUG: print("DEBUG: BEFORE blocked:", blocked)
+ # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
blocked = fba.tidyup(blocked)
- # NOISY-DEBUG: print("DEBUG: AFTER blocked:", blocked)
+ # DEBUG: print("DEBUG: AFTER blocked:", blocked)
if blocked == "":
print("WARNING: blocked is empty after fba.tidyup():", blocker, block_level)
continue
+ elif fba.is_blacklisted(blocked):
+ # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
+ continue
elif blocked.count("*") > 1:
# same domain guess as above, but for reasons field
fba.cursor.execute(
blocked = searchres[0]
origin = searchres[1]
nodeinfo_url = searchres[2]
+ elif not validators.domain(blocked):
+ print(f"WARNING: blocked='{blocked}' is not a valid domai name - skipped!")
+ continue
- # NOISY-DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
+ # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
if not fba.is_instance_registered(blocked):
- # NOISY-DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
+ # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
fba.add_instance(blocked, blocker, origin, nodeinfo_url)
- # NOISY-DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason["reason"])
+ # DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason["reason"])
fba.update_block_reason(reason["reason"], blocker, blocked, block_level)
for entry in blockdict:
if entry["blocked"] == blocked:
- # NOISY-DEBUG: print("DEBUG: Updating entry reason:", blocked)
+ # DEBUG: print("DEBUG: Updating entry reason:", blocked)
entry["reason"] = reason["reason"]
fba.connection.commit()
}
# handling CSRF, I've saw at least one server requiring it to access the endpoint
- # NOISY-DEBUG: print("DEBUG: Fetching meta:", blocker)
+ # DEBUG: print("DEBUG: Fetching meta:", blocker)
meta = bs4.BeautifulSoup(
- reqto.get(f"https://{blocker}/about", headers=fba.headers, timeout=(fba.config["connection_timeout"], config["read_timeout"])).text,
+ reqto.get(f"https://{blocker}/", headers=fba.headers, timeout=(fba.config["connection_timeout"], fba.config["read_timeout"])).text,
"html.parser",
)
try:
csrf = meta.find("meta", attrs={"name": "csrf-token"})["content"]
- # NOISY-DEBUG: print("DEBUG: Adding CSRF token:", blocker, csrf)
+ # DEBUG: print("DEBUG: Adding CSRF token:", blocker, csrf)
reqheaders = {**fba.api_headers, **{"X-CSRF-Token": csrf}}
- except:
- # NOISY-DEBUG: print("DEBUG: No CSRF token found, using normal headers:", blocker)
+ except BaseException as e:
+ # DEBUG: print("DEBUG: No CSRF token found, using normal headers:", blocker, e)
reqheaders = fba.api_headers
- # NOISY-DEBUG: print("DEBUG: Quering API domain_blocks:", blocker)
- blocks = reqto.get(f"https://{blocker}/api/v1/instance/domain_blocks", headers=reqheaders, timeout=(fba.config["connection_timeout"], config["read_timeout"])).json()
+ # DEBUG: print("DEBUG: Querying API domain_blocks:", blocker)
+ blocks = reqto.get(f"https://{blocker}/api/v1/instance/domain_blocks", headers=reqheaders, timeout=(fba.config["connection_timeout"], fba.config["read_timeout"])).json()
- # NOISY-DEBUG: print("DEBUG: blocks():", len(blocks))
+ print(f"INFO: Checking {len(blocks)} entries from blocker='{blocker}' ...")
for block in blocks:
entry = {
'domain': block['domain'],
'reason': block['comment']
}
- # NOISY-DEBUG: print("DEBUG: severity,domain,hash,comment:", block['severity'], block['domain'], block['digest'], block['comment'])
+ # DEBUG: print("DEBUG: severity,domain,hash,comment:", block['severity'], block['domain'], block['digest'], block['comment'])
if block['severity'] == 'suspend':
json['reject'].append(entry)
elif block['severity'] == 'silence':
json['report_removal'].append(entry)
else:
print("WARNING: Unknown severity:", block['severity'], block['domain'])
- except:
- # NOISY-DEBUG: print("DEBUG: Failed, Trying mastodon-specific fetches:", blocker)
+ except BaseException as e:
+ # DEBUG: print(f"DEBUG: Failed, trying mastodon-specific fetches: blocker='{blocker}',exception[{type(e)}]={str(e)}")
json = fba.get_mastodon_blocks(blocker)
- # NOISY-DEBUG: print("DEBUG: json.items():", blocker, len(json.items()))
+ print(f"INFO: Checking {len(json.items())} entries from blocker='{blocker}' ...")
for block_level, blocks in json.items():
- # NOISY-DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))
+ # DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))
block_level = fba.tidyup(block_level)
- # NOISY-DEBUG: print("DEBUG: AFTER-block_level:", block_level)
+ # DEBUG: print("DEBUG: AFTER-block_level:", block_level)
if block_level == "":
print("WARNING: block_level is empty, blocker:", blocker)
continue
for instance in blocks:
blocked, blocked_hash, reason = instance.values()
- # NOISY-DEBUG: print("DEBUG: blocked,hash,reason:", blocked, blocked_hash, reason)
+ # DEBUG: print("DEBUG: blocked,hash,reason:", blocked, blocked_hash, reason)
blocked = fba.tidyup(blocked)
- # NOISY-DEBUG: print("DEBUG: AFTER-blocked:", blocked)
+ # DEBUG: print("DEBUG: AFTER-blocked:", blocked)
if blocked == "":
print("WARNING: blocked is empty:", blocker)
continue
- elif blocked.count("*") < 1:
- # No obsfucation for this instance
- fba.cursor.execute(
- "SELECT hash FROM instances WHERE domain = ? LIMIT 1", [blocked]
- )
-
- if fba.cursor.fetchone() == None:
- # NOISY-DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
- fba.add_instance(blocked, blocker, origin, nodeinfo_url)
- else:
+ elif fba.is_blacklisted(blocked):
+ # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
+ continue
+ elif blocked.count("*") > 0:
# Doing the hash search for instance names as well to tidy up DB
fba.cursor.execute(
"SELECT domain, origin, nodeinfo_url FROM instances WHERE hash = ? LIMIT 1", [blocked_hash]
searchres = fba.cursor.fetchone()
if searchres != None:
- # NOISY-DEBUG: print("DEBUG: Updating domain: ", searchres[0])
+ # DEBUG: print("DEBUG: Updating domain: ", searchres[0])
blocked = searchres[0]
origin = searchres[1]
nodeinfo_url = searchres[2]
- # NOISY-DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
+ # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
if not fba.is_instance_registered(blocked):
- # NOISY-DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
+ # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
fba.add_instance(blocked, blocker, origin, nodeinfo_url)
+ elif not validators.domain(blocked):
+ print(f"WARNING: blocked='{blocked}' is not a valid domai name - skipped!")
+ continue
+
+ # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
+ if not fba.is_instance_registered(blocked):
+ # DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
+ fba.add_instance(blocked, blocker, origin, nodeinfo_url)
fba.cursor.execute(
"SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
)
if fba.cursor.fetchone() == None:
+ # DEBUG: print("DEBUG: Blocking:", blocker, blocked, block_level)
fba.block_instance(blocker, blocked if blocked.count("*") <= 1 else blocked_hash, reason, block_level)
if block_level == "reject":
fba.update_last_seen(blocker, blocked if blocked.count("*") <= 1 else blocked_hash, block_level)
if reason != "":
- # NOISY-DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason)
+ # DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason)
fba.update_block_reason(reason, blocker, blocked if blocked.count("*") <= 1 else blocked_hash, block_level)
fba.connection.commit()
print("WARNING: takahe is not fully supported for fetching blacklist!", blocker)
#json = fba.get_takahe_blocks(blocker)
+ print(f"INFO: Checking {len(json.items())} entries from blocker='{blocker}' ...")
for block_level, blocks in json.items():
- # NOISY-DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))
+ # DEBUG: print("DEBUG: blocker,block_level,blocks():", blocker, block_level, len(blocks))
block_level = fba.tidyup(block_level)
- # NOISY-DEBUG: print("DEBUG: AFTER-block_level:", block_level)
+ # DEBUG: print("DEBUG: AFTER-block_level:", block_level)
if block_level == "":
print("WARNING: block_level is empty, blocker:", blocker)
continue
for instance in blocks:
blocked, reason = instance.values()
- # NOISY-DEBUG: print("DEBUG: BEFORE blocked:", blocked)
+ # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
blocked = fba.tidyup(blocked)
- # NOISY-DEBUG: print("DEBUG: AFTER blocked:", blocked)
+ # DEBUG: print("DEBUG: AFTER blocked:", blocked)
if blocked == "":
print("WARNING: blocked is empty:", blocker)
continue
+ elif fba.is_blacklisted(blocked):
+ # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
+ continue
elif blocked.count("*") > 0:
# Some friendica servers also obscure domains without hash
fba.cursor.execute(
blocked = searchres[0]
origin = searchres[1]
nodeinfo_url = searchres[2]
-
- if blocked.count("?") > 0:
+ elif blocked.count("?") > 0:
# Some obscure them with question marks, not sure if that's dependent on version or not
fba.cursor.execute(
"SELECT domain, origin, nodeinfo_url FROM instances WHERE domain LIKE ? ORDER BY rowid LIMIT 1", [blocked.replace("?", "_")]
blocked = searchres[0]
origin = searchres[1]
nodeinfo_url = searchres[2]
+ elif not validators.domain(blocked):
+ print(f"WARNING: blocked='{blocked}' is not a valid domai name - skipped!")
+ continue
- # NOISY-DEBUG: print("DEBUG: AFTER-blocked:", blocked)
+ # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
if not fba.is_instance_registered(blocked):
- # NOISY-DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
+ # DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker)
fba.add_instance(blocked, blocker, origin, nodeinfo_url)
fba.cursor.execute(
- "SELECT * FROM blocks WHERE blocker = ? AND blocked = ?",
+ "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? LIMIT 1",
(blocker, blocked),
)
fba.update_last_seen(blocker, blocked, block_level)
if reason != '':
- # NOISY-DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason)
+ # DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, reason)
fba.update_block_reason(reason, blocker, blocked, block_level)
fba.connection.commit()
print("INFO: blocker:", blocker)
try:
# Blocks
- federation = reqto.get(f"https://{blocker}{get_peers_url}?filter=suspended", headers=fba.api_headers, timeout=(fba.config["connection_timeout"], config["read_timeout"])).json()
+ federation = reqto.get(f"https://{blocker}{fba.get_peers_url}?filter=suspended", headers=fba.api_headers, timeout=(fba.config["connection_timeout"], fba.config["read_timeout"])).json()
if (federation == None):
print("WARNING: No valid response:", blocker);
elif "error" in federation:
print("WARNING: API returned error:", federation["error"])
else:
- # NOISY-DEBUG: print("DEBUG: Checking fenderation():", len(federation))
+ print(f"INFO: Checking {len(federation)} entries from blocker='{blocker}' ...")
for peer in federation:
blocked = peer["domain"].lower()
- # NOISY-DEBUG: print("DEBUG: BEFORE blocked:", blocked)
+ # DEBUG: print("DEBUG: BEFORE blocked:", blocked)
blocked = fba.tidyup(blocked)
- # NOISY-DEBUG: print("DEBUG: AFTER blocked:", blocked)
+ # DEBUG: print("DEBUG: AFTER blocked:", blocked)
if blocked == "":
print("WARNING: blocked is empty:", blocker)
continue
+ elif fba.is_blacklisted(blocked):
+ # DEBUG: print(f"DEBUG: blocked='{blocked}' is blacklisted - skipping!")
+ continue
elif blocked.count("*") > 0:
# GTS does not have hashes for obscured domains, so we have to guess it
fba.cursor.execute(
blocked = searchres[0]
origin = searchres[1]
nodeinfo_url = searchres[2]
+ elif not validators.domain(blocked):
+ print(f"WARNING: blocked='{blocked}' is not a valid domai name - skipped!")
+ continue
+ # DEBUG: print("DEBUG: Looking up instance by domain:", blocked)
if not fba.is_instance_registered(blocked):
- # NOISY-DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
+ # DEBUG: print(f"DEBUG: Domain blocked='{blocked}' wasn't found, adding ..., blocker='{blocker}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
fba.add_instance(blocked, blocker, origin, nodeinfo_url)
fba.cursor.execute(
)
if fba.cursor.fetchone() == None:
- # NOISY-DEBUG: print(f"DEBUG: blocker='{blocker}' is blocking '{blocked}' for unknown reason at this point")
+ # DEBUG: print(f"DEBUG: blocker='{blocker}' is blocking '{blocked}' for unknown reason at this point")
fba.block_instance(blocker, blocked, "unknown", "reject")
blockdict.append(
fba.update_last_seen(blocker, blocked, "reject")
if "public_comment" in peer:
- # NOISY-DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, peer["public_comment"])
+ # DEBUG: print("DEBUG: Updating block reason:", blocker, blocked, peer["public_comment"])
fba.update_block_reason(peer["public_comment"], blocker, blocked, "reject")
for entry in blockdict:
if entry["blocked"] == blocked:
- # NOISY-DEBUG: print(f"DEBUG: Setting block reason for blocked='{blocked}':'{peer['public_comment']}'")
+ # DEBUG: print(f"DEBUG: Setting block reason for blocked='{blocked}':'{peer['public_comment']}'")
entry["reason"] = peer["public_comment"]
fba.connection.commit()
projects / fba.git / blobdiff