From ebeece808eb53b4a72a59725b6079d4d6a9eef6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 12 Jun 2023 21:14:44 +0200 Subject: [PATCH] Continued: - prevent .arpa domains being added by instances.add() --- fba/commands.py | 3 +++ fba/networks/pleroma.py | 1 + 2 files changed, 4 insertions(+) diff --git a/fba/commands.py b/fba/commands.py index da46e6c..2c50c68 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -237,6 +237,9 @@ def fetch_blocks(args: argparse.Namespace): if not validators.domain(blocked): print(f"WARNING: blocked='{blocked}',software='{software}' is not a valid domain name - SKIPPED!") continue + elif blocked.endswith(".arpa"): + # DEBUG: print(f"DEBUG: blocked='{blocked}' is ending with '.arpa' - SKIPPED!") + continue elif not instances.is_registered(blocked): # DEBUG: print("DEBUG: Hash wasn't found, adding:", blocked, blocker) try: diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py index 6fe2422..6822495 100644 --- a/fba/networks/pleroma.py +++ b/fba/networks/pleroma.py @@ -311,6 +311,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str): if entry["blocked"] == blocked: # DEBUG: print(f"DEBUG: Updating entry reason: blocked='{blocked}',reason='{reason}'") entry["reason"] = reason + elif "quarantined_instances_info" in data and "quarantined_instances" in data["quarantined_instances_info"]: # DEBUG: print(f"DEBUG: Found 'quarantined_instances_info' in JSON response: domain='{domain}'") block_level = "quarantined" -- 2.39.5