X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fba%2Ffba.py;h=a34690f8c07905611913dc64833d6ec2d8b55b72;hb=434855d0ceb92dad9b00aba14247ed71afc12f6c;hp=228f98cfd32f2dcb292cb63d2f69257701e0087f;hpb=d4e620c6fb05c9c1741a89c412fe1e14cfb37940;p=fba.git
diff --git a/fba/fba.py b/fba/fba.py
index 228f98c..a34690f 100644
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -1,4 +1,3 @@
-# Fedi API Block - An aggregator for fetching blocking data from fediverse nodes
# Copyright (C) 2023 Free Software Foundation
#
# This program is free software: you can redistribute it and/or modify
@@ -14,37 +13,27 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-import bs4
-from fba import cache
import hashlib
import re
-import reqto
import json
import sqlite3
import sys
import time
+
+from urllib.parse import urlparse
+
+import bs4
+import requests
import validators
-with open("config.json") as f:
- config = json.loads(f.read())
-
-# Don't check these, known trolls/flooders/testing/developing
-blacklist = [
- # Floods network with fake nodes as "research" project
- "activitypub-troll.cf",
- # Similar troll
- "gab.best",
- # Similar troll
- "4chan.icu",
- # Flooder (?)
- "social.shrimpcam.pw",
- # Flooder (?)
- "mastotroll.netz.org",
- # Testing/developing installations
- "ngrok.io",
- "ngrok-free.app",
- "misskeytest.chn.moe",
-]
+from fba import blacklist
+from fba import config
+from fba import instances
+from fba import network
+
+from fba.federation import lemmy
+from fba.federation import misskey
+from fba.federation import peertube
# Array with pending errors needed to be written to database
pending_errors = {
@@ -62,70 +51,6 @@ nodeinfo_identifier = [
"http://nodeinfo.diaspora.software/ns/schema/1.0",
]
-# HTTP headers for non-API requests
-headers = {
- "User-Agent": config["useragent"],
-}
-
-# HTTP headers for API requests
-api_headers = {
- "User-Agent": config["useragent"],
- "Content-Type": "application/json",
-}
-
-# Found info from node, such as nodeinfo URL, detection mode that needs to be
-# written to database. Both arrays must be filled at the same time or else
-# update_instance_data() will fail
-instance_data = {
- # Detection mode: 'AUTO_DISCOVERY', 'STATIC_CHECKS' or 'GENERATOR'
- # NULL means all detection methods have failed (maybe still reachable instance)
- "detection_mode" : {},
- # Found nodeinfo URL
- "nodeinfo_url" : {},
- # Found total peers
- "total_peers" : {},
- # Last fetched instances
- "last_instance_fetch": {},
- # Last updated
- "last_updated" : {},
- # Last blocked
- "last_blocked" : {},
- # Last nodeinfo (fetched)
- "last_nodeinfo" : {},
- # Last status code
- "last_status_code" : {},
- # Last error details
- "last_error_details" : {},
-}
-
-language_mapping = {
- # English -> English
- "Silenced instances" : "Silenced servers",
- "Suspended instances" : "Suspended servers",
- "Limited instances" : "Limited servers",
- # Mappuing German -> English
- "Gesperrte Server" : "Suspended servers",
- "Gefilterte Medien" : "Filtered media",
- "Stummgeschaltete Server" : "Silenced servers",
- # Japanese -> English
- "åæ¢æ¸ã¿ã®ãµã¼ãã¼" : "Suspended servers",
- "å¶éä¸ã®ãµã¼ãã¼" : "Limited servers",
- "ã¡ãã£ã¢ãæå¦ãã¦ãããµã¼ãã¼": "Filtered media",
- "ãµã¤ã¬ã³ã¹æ¸ã¿ã®ãµã¼ãã¼" : "Silenced servers",
- # ??? -> English
- "שרת×× ××שע××" : "Suspended servers",
- "×××× ×ס×× × ×ª" : "Filtered media",
- "שרת×× ×××××××" : "Silenced servers",
- # French -> English
- "Serveurs suspendus" : "Suspended servers",
- "Médias filtrés" : "Filtered media",
- "Serveurs limités" : "Limited servers",
- "Serveurs modérés" : "Limited servers",
-}
-
-# URL for fetching peers
-get_peers_url = "/api/v1/instance/peers"
-
# Connect to database
connection = sqlite3.connect("blocks.db")
cursor = connection.cursor()
@@ -145,45 +70,51 @@ patterns = [
##### Other functions #####
def is_primitive(var: any) -> bool:
- # NOISY-DEBUG: print(f"DEBUG: var[]='{type(var)}' - CALLED!")
- return type(var) in {int, str, float, bool} or var == None
+ # DEBUG: print(f"DEBUG: var[]='{type(var)}' - CALLED!")
+ return type(var) in {int, str, float, bool} or var is None
def fetch_instances(domain: str, origin: str, software: str, script: str, path: str = None):
- if type(domain) != str:
+ # DEBUG: print(f"DEBUG: domain='{domain}',origin='{origin}',software='{software}',path='{path}' - CALLED!")
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(origin) != str and origin != None:
+ raise ValueError("Parameter 'domain' is empty")
+ elif not isinstance(origin, str) and origin is not None:
raise ValueError(f"Parameter origin[]={type(origin)} is not 'str'")
- elif type(script) != str:
+ elif software is None:
+ # DEBUG: print(f"DEBUG: software for domain='{domain}' is not set, determining ...")
+ software = determine_software(domain, path)
+ # DEBUG: print(f"DEBUG: Determined software='{software}' for domain='{domain}'")
+ elif not isinstance(software, str):
+ raise ValueError(f"Parameter software[]={type(software)} is not 'str'")
+ elif not isinstance(script, str):
raise ValueError(f"Parameter script[]={type(script)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
+ raise ValueError("Parameter 'domain' is empty")
- # DEBUG: print("DEBUG: domain,origin,software,path:", domain, origin, software, path)
- if not is_instance_registered(domain):
+ if not instances.is_registered(domain):
# DEBUG: print("DEBUG: Adding new domain:", domain, origin)
- add_instance(domain, origin, script, path)
+ instances.add(domain, origin, script, path)
# DEBUG: print("DEBUG: Fetching instances for domain:", domain, software)
- peerlist = get_peers(domain, software)
+ peerlist = fetch_peers(domain, software)
- if (peerlist is None):
+ if peerlist is None:
print("ERROR: Cannot fetch peers:", domain)
return
- elif has_pending_instance_data(domain):
+ elif instances.has_pending_instance_data(domain):
# DEBUG: print(f"DEBUG: domain='{domain}' has pending nodeinfo data, flushing ...")
- update_instance_data(domain)
+ instances.update_data(domain)
print(f"INFO: Checking {len(peerlist)} instances from {domain} ...")
for instance in peerlist:
- if instance == None:
+ if instance is None:
# Skip "None" types as tidup() cannot parse them
continue
- # DEBUG: print(f"DEBUG: instance[{type(instance}]={instance} - BEFORE")
+ # DEBUG: print(f"DEBUG: instance='{instance}' - BEFORE")
instance = tidyup_domain(instance)
- # DEBUG: print(f"DEBUG: instance[{type(instance}]={instance} - AFTER")
+ # DEBUG: print(f"DEBUG: instance='{instance}' - AFTER")
if instance == "":
print("WARNING: Empty instance after tidyup_domain(), domain:", domain)
@@ -191,54 +122,34 @@ def fetch_instances(domain: str, origin: str, software: str, script: str, path:
elif not validators.domain(instance.split("/")[0]):
print(f"WARNING: Bad instance='{instance}' from domain='{domain}',origin='{origin}',software='{software}'")
continue
- elif is_blacklisted(instance):
+ elif blacklist.is_blacklisted(instance):
# DEBUG: print("DEBUG: instance is blacklisted:", instance)
continue
# DEBUG: print("DEBUG: Handling instance:", instance)
try:
- if not is_instance_registered(instance):
+ if not instances.is_registered(instance):
# DEBUG: print("DEBUG: Adding new instance:", instance, domain)
- add_instance(instance, domain, sys.argv[0])
- except BaseException as e:
- print(f"ERROR: instance='{instance}',exception[{type(e)}]:'{str(e)}'")
+ instances.add(instance, domain, script)
+ except BaseException as exc:
+ print(f"ERROR: instance='{instance}',exc[{type(exc)}]:'{str(exc)}'")
continue
# DEBUG: print("DEBUG: EXIT!")
-def set_instance_data(key: str, domain: str, value: any):
- # NOISY-DEBUG: print(f"DEBUG: key='{key}',domain='{domain}',value[]='{type(value)}' - CALLED!")
- if type(key) != str:
- raise ValueError("Parameter key[]='{type(key)}' is not 'str'")
- elif key == "":
- raise ValueError(f"Parameter 'key'Â cannot be empty")
- elif type(domain) != str:
- raise ValueError("Parameter domain[]='{type(domain)}' is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain'Â cannot be empty")
- elif not key in instance_data:
- raise ValueError(f"key='{key}' not found in instance_data")
- elif not is_primitive(value):
- raise ValueError(f"value[]='{type(value)}' is not a primitive type")
-
- # Set it
- instance_data[key][domain] = value
-
- # DEBUG: print("DEBUG: EXIT!")
-
def add_peers(rows: dict) -> list:
# DEBUG: print(f"DEBUG: rows()={len(rows)} - CALLED!")
peers = list()
- for element in ["linked", "allowed", "blocked"]:
- # DEBUG: print(f"DEBUG: Checking element='{element}'")
- if element in rows and rows[element] != None:
- # DEBUG: print(f"DEBUG: Adding {len(rows[element])} peer(s) to peers list ...")
- for peer in rows[element]:
+ for key in ["linked", "allowed", "blocked"]:
+ # DEBUG: print(f"DEBUG: Checking key='{key}'")
+ if key in rows and rows[key] is not None:
+ # DEBUG: print(f"DEBUG: Adding {len(rows[key])} peer(s) to peers list ...")
+ for peer in rows[key]:
# DEBUG: print(f"DEBUG: peer='{peer}' - BEFORE!")
peer = tidyup_domain(peer)
# DEBUG: print(f"DEBUG: peer='{peer}' - AFTER!")
- if is_blacklisted(peer):
+ if blacklist.is_blacklisted(peer):
# DEBUG: print(f"DEBUG: peer='{peer}' is blacklisted, skipped!")
continue
@@ -274,7 +185,6 @@ def remove_version(software: str) -> str:
# DEBUG: print(f"DEBUG: Was not able to find common seperator, returning untouched software='{software}'")
return software
- matches = None
match = None
# DEBUG: print(f"DEBUG: Checking {len(patterns)} patterns ...")
for pattern in patterns:
@@ -282,11 +192,12 @@ def remove_version(software: str) -> str:
match = pattern.match(version)
# DEBUG: print(f"DEBUG: match[]={type(match)}")
- if type(match) is re.Match:
+ if isinstance(match, re.Match):
+ # DEBUG: print(f"DEBUG: version='{version}' is matching pattern='{pattern}'")
break
# DEBUG: print(f"DEBUG: version[{type(version)}]='{version}',match='{match}'")
- if type(match) is not re.Match:
+ if not isinstance(match, re.Match):
print(f"WARNING: version='{version}' does not match regex, leaving software='{software}' untouched.")
return software
@@ -304,11 +215,12 @@ def remove_version(software: str) -> str:
def strip_powered_by(software: str) -> str:
# DEBUG: print(f"DEBUG: software='{software}' - CALLED!")
- if software == "":
- print(f"ERROR: Bad method call, 'software' is empty")
- raise Exception("Parameter 'software' is empty")
+ if not isinstance(software, str):
+ raise ValueError(f"Parameter software[]='{type(software)}' is not 'str'")
+ elif software == "":
+ raise ValueError("Parameter 'software' is empty")
elif not "powered by" in software:
- print(f"WARNING: Cannot find 'powered by' in '{software}'!")
+ print(f"WARNING: Cannot find 'powered by' in software='{software}'!")
return software
start = software.find("powered by ")
@@ -324,9 +236,10 @@ def strip_powered_by(software: str) -> str:
def strip_hosted_on(software: str) -> str:
# DEBUG: print(f"DEBUG: software='{software}' - CALLED!")
- if software == "":
- print(f"ERROR: Bad method call, 'software' is empty")
- raise Exception("Parameter 'software' is empty")
+ if not isinstance(software, str):
+ raise ValueError(f"Parameter software[]='{type(software)}' is not 'str'")
+ elif software == "":
+ raise ValueError("Parameter 'software' is empty")
elif not "hosted on" in software:
print(f"WARNING: Cannot find 'hosted on' in '{software}'!")
return software
@@ -334,7 +247,7 @@ def strip_hosted_on(software: str) -> str:
end = software.find("hosted on ")
# DEBUG: print(f"DEBUG: end[{type(end)}]='{end}'")
- software = software[0, start].strip()
+ software = software[0, end].strip()
# DEBUG: print(f"DEBUG: software='{software}'")
software = strip_until(software, " - ")
@@ -344,12 +257,14 @@ def strip_hosted_on(software: str) -> str:
def strip_until(software: str, until: str) -> str:
# DEBUG: print(f"DEBUG: software='{software}',until='{until}' - CALLED!")
- if software == "":
- print(f"ERROR: Bad method call, 'software' is empty")
- raise Exception("Parameter 'software' is empty")
+ if not isinstance(software, str):
+ raise ValueError(f"Parameter software[]='{type(software)}' is not 'str'")
+ elif software == "":
+ raise ValueError("Parameter 'software' is empty")
+ elif not isinstance(until, str):
+ raise ValueError(f"Parameter until[]='{type(until)}' is not 'str'")
elif until == "":
- print(f"ERROR: Bad method call, 'until' is empty")
- raise Exception("Parameter 'until' is empty")
+ raise ValueError("Parameter 'until' is empty")
elif not until in software:
print(f"WARNING: Cannot find '{until}' in '{software}'!")
return software
@@ -364,24 +279,11 @@ def strip_until(software: str, until: str) -> str:
# DEBUG: print(f"DEBUG: software='{software}' - EXIT!")
return software
-def is_blacklisted(domain: str) -> bool:
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- blacklisted = False
- for peer in blacklist:
- if peer in domain:
- blacklisted = True
-
- return blacklisted
-
def remove_pending_error(domain: str):
- if type(domain) != str:
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
+ raise ValueError("Parameter 'domain' is empty")
try:
# Prevent updating any pending errors, nodeinfo was found
@@ -393,364 +295,90 @@ def remove_pending_error(domain: str):
# DEBUG: print("DEBUG: EXIT!")
def get_hash(domain: str) -> str:
- if type(domain) != str:
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
+ raise ValueError("Parameter 'domain' is empty")
return hashlib.sha256(domain.encode("utf-8")).hexdigest()
-def update_last_blocked(domain: str):
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: Updating last_blocked for domain", domain)
- set_instance_data("last_blocked", domain, time.time())
-
- # Running pending updated
- # DEBUG: print(f"DEBUG: Invoking update_instance_data({domain}) ...")
- update_instance_data(domain)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def has_pending_instance_data(domain: str) -> bool:
- # DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- has_pending = False
- for key in instance_data:
- # DEBUG: print(f"DEBUG: key='{key}',domain='{domain}',instance_data[key]()='{len(instance_data[key])}'")
- if domain in instance_data[key]:
- has_pending = True
- break
-
- # DEBUG: print(f"DEBUG: has_pending='{has_pending}' - EXIT!")
- return has_pending
-
-def update_instance_data(domain: str):
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif not has_pending_instance_data(domain):
- raise Exception(f"Domain '{domain}' has no pending instance data, but function invoked")
-
- # DEBUG: print(f"DEBUG: Updating nodeinfo for domain='{domain}' ...")
- sql_string = ''
- fields = list()
- for key in instance_data:
- # DEBUG: print("DEBUG: key:", key)
- if domain in instance_data[key]:
- # DEBUG: print(f"DEBUG: Adding '{instance_data[key][domain]}' for key='{key}' ...")
- fields.append(instance_data[key][domain])
- sql_string += f" {key} = ?,"
-
- fields.append(domain)
-
- if sql_string == '':
- raise ValueError(f"No fields have been set, but method invoked, domain='{domain}'")
-
- # DEBUG: print(f"DEBUG: sql_string='{sql_string}',fields()={len(fields)}")
- sql_string = "UPDATE instances SET" + sql_string + " last_updated = TIME() WHERE domain = ? LIMIT 1"
- # DEBUG: print("DEBUG: sql_string:", sql_string)
-
- try:
- # DEBUG: print("DEBUG: Executing SQL:", sql_string)
- cursor.execute(sql_string, fields)
-
- # DEBUG: print(f"DEBUG: Success! (rowcount={cursor.rowcount })")
- if cursor.rowcount == 0:
- print(f"WARNING: Did not update any rows: domain='{domain}',fields()={len(fields)} - EXIT!")
- return
-
- connection.commit()
-
- # DEBUG: print("DEBUG: Deleting instance_data for domain:", domain)
- for key in instance_data:
- try:
- # DEBUG: print("DEBUG: Deleting key:", key)
- del instance_data[key][domain]
- except:
- pass
-
- except BaseException as e:
- print(f"ERROR: failed SQL query: domain='{domain}',sql_string='{sql_string}',exception[{type(e)}]:'{str(e)}'")
- sys.exit(255)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def log_error(domain: str, res: any):
- # DEBUG: print("DEBUG: domain,res[]:", domain, type(res))
- if type(domain) != str:
+def log_error(domain: str, response: requests.models.Response):
+ # DEBUG: print("DEBUG: domain,response[]:", domain, type(response))
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
+ raise ValueError("Parameter 'domain' is empty")
+ elif config.get("write_error_log").lower() != "true":
+ # DEBUG: print(f"DEBUG: Writing to error_log is disabled in configuruation file - EXIT!")
+ return
try:
- # DEBUG: print("DEBUG: BEFORE res[]:", type(res))
- if isinstance(res, BaseException) or isinstance(res, json.JSONDecodeError):
- res = str(res)
+ # DEBUG: print("DEBUG: BEFORE response[]:", type(response))
+ if isinstance(response, BaseException) or isinstance(response, json.decoder.JSONDecodeError):
+ response = f"response[{type(response)}]='{str(response)}'"
- # DEBUG: print("DEBUG: AFTER res[]:", type(res))
- if type(res) is str:
+ # DEBUG: print("DEBUG: AFTER response[]:", type(response))
+ if isinstance(response, str):
cursor.execute("INSERT INTO error_log (domain, error_code, error_message, created) VALUES (?, 999, ?, ?)",[
domain,
- res,
+ response,
time.time()
])
else:
cursor.execute("INSERT INTO error_log (domain, error_code, error_message, created) VALUES (?, ?, ?, ?)",[
domain,
- res.status_code,
- res.reason,
+ response.status_code,
+ response.reason,
time.time()
])
# Cleanup old entries
- # DEBUG: print(f"DEBUG: Purging old records (distance: {config['error_log_cleanup']})")
- cursor.execute("DELETE FROM error_log WHERE created < ?", [time.time() - config["error_log_cleanup"]])
- except BaseException as e:
- print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
+ # DEBUG: print(f"DEBUG: Purging old records (distance: {config.get('error_log_cleanup')})")
+ cursor.execute("DELETE FROM error_log WHERE created < ?", [time.time() - config.get("error_log_cleanup")])
+ except BaseException as exc:
+ print(f"ERROR: failed SQL query: domain='{domain}',exc[{type(exc)}]:'{str(exc)}'")
sys.exit(255)
# DEBUG: print("DEBUG: EXIT!")
-def update_last_error(domain: str, res: any):
- # DEBUG: print("DEBUG: domain,res[]:", domain, type(res))
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: BEFORE res[]:", type(res))
- if isinstance(res, BaseException) or isinstance(res, json.JSONDecodeError):
- res = str(res)
-
- # DEBUG: print("DEBUG: AFTER res[]:", type(res))
- if type(res) is str:
- # DEBUG: print(f"DEBUG: Setting last_error_details='{res}'");
- set_instance_data("last_status_code" , domain, 999)
- set_instance_data("last_error_details", domain, res)
- else:
- # DEBUG: print(f"DEBUG: Setting last_error_details='{res.reason}'");
- set_instance_data("last_status_code" , domain, res.status_code)
- set_instance_data("last_error_details", domain, res.reason)
-
- # Running pending updated
- # DEBUG: print(f"DEBUG: Invoking update_instance_data({domain}) ...")
- update_instance_data(domain)
-
- log_error(domain, res)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def update_last_instance_fetch(domain: str):
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: Updating last_instance_fetch for domain:", domain)
- set_instance_data("last_instance_fetch", domain, time.time())
-
- # Running pending updated
- # DEBUG: print(f"DEBUG: Invoking update_instance_data({domain}) ...")
- update_instance_data(domain)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def update_last_nodeinfo(domain: str):
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: Updating last_nodeinfo for domain:", domain)
- set_instance_data("last_nodeinfo", domain, time.time())
- set_instance_data("last_updated" , domain, time.time())
-
- # Running pending updated
- # DEBUG: print(f"DEBUG: Invoking update_instance_data({domain}) ...")
- update_instance_data(domain)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def get_peers(domain: str, software: str) -> list:
+def fetch_peers(domain: str, software: str) -> list:
# DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software={software} - CALLED!")
- if type(domain) != str:
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(software) != str and software != None:
+ raise ValueError("Parameter 'domain' is empty")
+ elif not isinstance(software, str) and software is not None:
raise ValueError(f"software[]={type(software)} is not 'str'")
- # DEBUG: print(f"DEBUG: domain='{domain}',software='{software}' - CALLED!")
- peers = list()
-
if software == "misskey":
- # DEBUG: print(f"DEBUG: domain='{domain}' is misskey, sending API POST request ...")
- offset = 0
- step = config["misskey_offset"]
-
- # iterating through all "suspended" (follow-only in its terminology)
- # instances page-by-page, since that troonware doesn't support
- # sending them all at once
- while True:
- # DEBUG: print(f"DEBUG: Fetching offset='{offset}' from '{domain}' ...")
- if offset == 0:
- fetched = post_json_api(domain, "/api/federation/instances", json.dumps({
- "sort" : "+pubAt",
- "host" : None,
- "limit": step
- }), {"Origin": domain})
- else:
- fetched = post_json_api(domain, "/api/federation/instances", json.dumps({
- "sort" : "+pubAt",
- "host" : None,
- "limit" : step,
- "offset": offset - 1
- }), {"Origin": domain})
-
- # DEBUG: print("DEBUG: fetched():", len(fetched))
- if len(fetched) == 0:
- # DEBUG: print("DEBUG: Returned zero bytes, exiting loop:", domain)
- break
- elif len(fetched) != config["misskey_offset"]:
- # DEBUG: print(f"DEBUG: Fetched '{len(fetched)}' row(s) but expected: '{config['misskey_offset']}'")
- offset = offset + (config["misskey_offset"] - len(fetched))
- else:
- # DEBUG: print("DEBUG: Raising offset by step:", step)
- offset = offset + step
-
- # Check records
- # DEBUG: print(f"DEBUG: fetched({len(fetched)})[]={type(fetched)}")
- if isinstance(fetched, dict) and "error" in fetched and "message" in fetched["error"]:
- print(f"WARNING: post_json_api() returned error: {fetched['error']['message']}")
- update_last_error(domain, fetched["error"]["message"])
- break
-
- for row in fetched:
- # DEBUG: print(f"DEBUG: row():{len(row)}")
- if not "host" in row:
- print(f"WARNING: row()={len(row)} does not contain element 'host': {row},domain='{domain}'")
- continue
- elif type(row["host"]) != str:
- print(f"WARNING: row[host][]={type(row['host'])} is not 'str'")
- continue
- elif is_blacklisted(row["host"]):
- # DEBUG: print(f"DEBUG: row[host]='{row['host']}' is blacklisted. domain='{domain}'")
- continue
-
- # DEBUG: print(f"DEBUG: Adding peer: '{row['host']}'")
- peers.append(row["host"])
-
- # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
- set_instance_data("total_peers", domain, len(peers))
-
- # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
- update_last_instance_fetch(domain)
-
- # DEBUG: print("DEBUG: Returning peers[]:", type(peers))
- return peers
+ # DEBUG: print(f"DEBUG: Invoking misskey.fetch_peers({domain}) ...")
+ return misskey.fetch_peers(domain)
elif software == "lemmy":
- # DEBUG: print(f"DEBUG: domain='{domain}' is Lemmy, fetching JSON ...")
- try:
- res = reqto.get(f"https://{domain}/api/v3/site", headers=api_headers, timeout=(config["connection_timeout"], config["read_timeout"]))
-
- data = res.json()
- # DEBUG: print(f"DEBUG: res.ok={res.ok},res.status_code='{res.status_code}',data[]='{type(data)}'")
- if not res.ok or res.status_code >= 400:
- print("WARNING: Could not reach any JSON API:", domain)
- update_last_error(domain, res)
- elif res.ok and isinstance(data, list):
- # DEBUG: print(f"DEBUG: domain='{domain}' returned a list: '{data}'")
- sys.exit(255)
- elif "federated_instances" in data:
- # DEBUG: print(f"DEBUG: Found federated_instances for domain='{domain}'")
- peers = peers + add_peers(data["federated_instances"])
- # DEBUG: print("DEBUG: Added instance(s) to peers")
- else:
- print("WARNING: JSON response does not contain 'federated_instances':", domain)
- update_last_error(domain, res)
-
- except BaseException as e:
- print(f"WARNING: Exception during fetching JSON: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
-
- # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
- set_instance_data("total_peers", domain, len(peers))
-
- # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
- update_last_instance_fetch(domain)
-
- # DEBUG: print("DEBUG: Returning peers[]:", type(peers))
- return peers
+ # DEBUG: print(f"DEBUG: Invoking lemmy.fetch_peers({domain}) ...")
+ return lemmy.fetch_peers(domain)
elif software == "peertube":
- # DEBUG: print(f"DEBUG: domain='{domain}' is a PeerTube, fetching JSON ...")
-
- start = 0
- for mode in ["followers", "following"]:
- # DEBUG: print(f"DEBUG: domain='{domain}',mode='{mode}'")
- while True:
- try:
- res = reqto.get(f"https://{domain}/api/v1/server/{mode}?start={start}&count=100", headers=headers, timeout=(config["connection_timeout"], config["read_timeout"]))
-
- data = res.json()
- # DEBUG: print(f"DEBUG: res.ok={res.ok},res.status_code='{res.status_code}',data[]='{type(data)}'")
- if res.ok and isinstance(data, dict):
- # DEBUG: print("DEBUG: Success, data:", len(data))
- if "data" in data:
- # DEBUG: print(f"DEBUG: Found {len(data['data'])} record(s).")
- for record in data["data"]:
- # DEBUG: print(f"DEBUG: record()={len(record)}")
- if mode in record and "host" in record[mode]:
- # DEBUG: print(f"DEBUG: Found host={record[mode]['host']}, adding ...")
- peers.append(record[mode]["host"])
- else:
- print(f"WARNING: record from '{domain}' has no '{mode}' or 'host' record: {record}")
-
- if len(data["data"]) < 100:
- # DEBUG: print("DEBUG: Reached end of JSON response:", domain)
- break
-
- # Continue with next row
- start = start + 100
-
- except BaseException as e:
- print(f"WARNING: Exception during fetching JSON: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
-
- # DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
- set_instance_data("total_peers", domain, len(peers))
-
- # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
- update_last_instance_fetch(domain)
-
- # DEBUG: print("DEBUG: Returning peers[]:", type(peers))
- return peers
-
- # DEBUG: print(f"DEBUG: Fetching get_peers_url='{get_peers_url}' from '{domain}' ...")
+ # DEBUG: print(f"DEBUG: Invoking peertube.fetch_peers({domain}) ...")
+ return peertube.fetch_peers(domain)
+
+ # DEBUG: print(f"DEBUG: Fetching peers from '{domain}',software='{software}' ...")
+ peers = list()
try:
- res = reqto.get(f"https://{domain}{get_peers_url}", headers=api_headers, timeout=(config["connection_timeout"], config["read_timeout"]))
+ response = network.fetch_response(domain, "/api/v1/instance/peers", network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
+ # DEBUG: print(f"DEBUG: response[]='{type(response)}'")
+
+ data = json_from_response(response)
+ # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
- data = res.json()
- # DEBUG: print(f"DEBUG: res.ok={res.ok},res.status_code={res.status_code},data[]='{type(data)}'")
- if not res.ok or res.status_code >= 400:
- # DEBUG: print(f"DEBUG: Was not able to fetch '{get_peers_url}', trying alternative ...")
- res = reqto.get(f"https://{domain}/api/v3/site", headers=api_headers, timeout=(config["connection_timeout"], config["read_timeout"]))
+ if not response.ok or response.status_code >= 400:
+ # DEBUG: print("DEBUG: Was not able to fetch peers, trying alternative ...")
+ response = network.fetch_response(domain, "/api/v3/site", network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
- data = res.json()
- # DEBUG: print(f"DEBUG: res.ok={res.ok},res.status_code={res.status_code},data[]='{type(data)}'")
- if not res.ok or res.status_code >= 400:
+ data = json_from_response(response)
+ # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
+ if not response.ok or response.status_code >= 400:
print("WARNING: Could not reach any JSON API:", domain)
- update_last_error(domain, res)
- elif res.ok and isinstance(data, list):
+ instances.update_last_error(domain, response)
+ elif response.ok and isinstance(data, list):
# DEBUG: print(f"DEBUG: domain='{domain}' returned a list: '{data}'")
sys.exit(255)
elif "federated_instances" in data:
@@ -759,63 +387,34 @@ def get_peers(domain: str, software: str) -> list:
# DEBUG: print("DEBUG: Added instance(s) to peers")
else:
print("WARNING: JSON response does not contain 'federated_instances':", domain)
- update_last_error(domain, res)
+ instances.update_last_error(domain, response)
else:
# DEBUG: print("DEBUG: Querying API was successful:", domain, len(data))
peers = data
- except BaseException as e:
- print("WARNING: Some error during get():", domain, e)
- update_last_error(domain, e)
+ except BaseException as exc:
+ print("WARNING: Some error during fetch_peers():", domain, exc)
+ instances.update_last_error(domain, exc)
# DEBUG: print(f"DEBUG: Adding '{len(peers)}' for domain='{domain}'")
- set_instance_data("total_peers", domain, len(peers))
+ instances.set_data("total_peers", domain, len(peers))
# DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
- update_last_instance_fetch(domain)
+ instances.update_last_instance_fetch(domain)
# DEBUG: print("DEBUG: Returning peers[]:", type(peers))
return peers
-def post_json_api(domain: str, path: str, parameter: str, extra_headers: dict = {}) -> dict:
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(path) != str:
- raise ValueError(f"path[]={type(path)} is not 'str'")
- elif path == "":
- raise ValueError(f"path cannot be empty")
- elif type(parameter) != str:
- raise ValueError(f"parameter[]={type(parameter)} is not 'str'")
-
- # DEBUG: print("DEBUG: Sending POST to domain,path,parameter:", domain, path, parameter, extra_headers)
- data = {}
- try:
- res = reqto.post(f"https://{domain}{path}", data=parameter, headers={**api_headers, **extra_headers}, timeout=(config["connection_timeout"], config["read_timeout"]))
-
- data = res.json()
- # DEBUG: print(f"DEBUG: res.ok={res.ok},res.status_code={res.status_code},data[]='{type(data)}'")
- if not res.ok or res.status_code >= 400:
- print(f"WARNING: Cannot query JSON API: domain='{domain}',path='{path}',parameter()={len(parameter)},res.status_code='{res.status_code}',data[]='{type(data)}'")
- update_last_error(domain, res)
-
- except BaseException as e:
- print(f"WARNING: Some error during post(): domain='{domain}',path='{path}',parameter()={len(parameter)},exception[{type(e)}]:'{str(e)}'")
-
- # DEBUG: print(f"DEBUG: Returning data({len(data)})=[]:{type(data)}")
- return data
-
def fetch_nodeinfo(domain: str, path: str = None) -> list:
# DEBUG: print(f"DEBUG: domain='{domain}',path={path} - CALLED!")
- if type(domain) != str:
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(path) != str and path != None:
+ raise ValueError("Parameter 'domain' is empty")
+ elif not isinstance(path, str) and path is not None:
raise ValueError(f"Parameter path[]={type(path)} is not 'str'")
- # DEBUG: print("DEBUG: Fetching nodeinfo from domain,path:", domain, path)
+ # DEBUG: print(f"DEBUG: Fetching nodeinfo from domain='{domain}' ...")
nodeinfo = fetch_wellknown_nodeinfo(domain)
# DEBUG: print(f"DEBUG: nodeinfo({len(nodeinfo)})={nodeinfo}")
@@ -823,64 +422,64 @@ def fetch_nodeinfo(domain: str, path: str = None) -> list:
# DEBUG: print("DEBUG: nodeinfo()={len(nodeinfo))} - EXIT!")
return nodeinfo
- requests = [
- f"https://{domain}/nodeinfo/2.1.json",
- f"https://{domain}/nodeinfo/2.1",
- f"https://{domain}/nodeinfo/2.0.json",
- f"https://{domain}/nodeinfo/2.0",
- f"https://{domain}/nodeinfo/1.0",
- f"https://{domain}/api/v1/instance"
+ request_paths = [
+ "/nodeinfo/2.1.json",
+ "/nodeinfo/2.1",
+ "/nodeinfo/2.0.json",
+ "/nodeinfo/2.0",
+ "/nodeinfo/1.0",
+ "/api/v1/instance"
]
data = {}
- for request in requests:
- if path != None and path != "" and request != path:
+ for request in request_paths:
+ if path is not None and path != "" and path != f"https://{domain}{path}":
# DEBUG: print(f"DEBUG: path='{path}' does not match request='{request}' - SKIPPED!")
continue
try:
- # DEBUG: print("DEBUG: Fetching request:", request)
- res = reqto.get(request, headers=api_headers, timeout=(config["connection_timeout"], config["read_timeout"]))
+ # DEBUG: print(f"DEBUG: Fetching request='{request}' from domain='{domain}' ...")
+ response = network.fetch_response(domain, request, network.api_headers, (config.get("nodeinfo_connection_timeout"), config.get("nodeinfo_read_timeout")))
- data = res.json()
- # DEBUG: print(f"DEBUG: res.ok={res.ok},res.status_code={res.status_code},data[]='{type(data)}'")
- if res.ok and isinstance(data, dict):
+ data = json_from_response(response)
+ # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
+ if response.ok and isinstance(data, dict):
# DEBUG: print("DEBUG: Success:", request)
- set_instance_data("detection_mode", domain, "STATIC_CHECK")
- set_instance_data("nodeinfo_url" , domain, request)
+ instances.set_data("detection_mode", domain, "STATIC_CHECK")
+ instances.set_data("nodeinfo_url" , domain, request)
break
- elif res.ok and isinstance(data, list):
- # DEBUG: print(f"DEBUG: domain='{domain}' returned a list: '{data}'")
+ elif response.ok and isinstance(data, list):
+ print(f"UNSUPPORTED: domain='{domain}' returned a list: '{data}'")
sys.exit(255)
- elif not res.ok or res.status_code >= 400:
+ elif not response.ok or response.status_code >= 400:
print("WARNING: Failed fetching nodeinfo from domain:", domain)
- update_last_error(domain, res)
+ instances.update_last_error(domain, response)
continue
- except BaseException as e:
+ except BaseException as exc:
# DEBUG: print("DEBUG: Cannot fetch API request:", request)
- update_last_error(domain, e)
+ instances.update_last_error(domain, exc)
pass
# DEBUG: print(f"DEBUG: data()={len(data)} - EXIT!")
return data
def fetch_wellknown_nodeinfo(domain: str) -> list:
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
+ # DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
+ raise ValueError("Parameter 'domain' is empty")
# DEBUG: print("DEBUG: Fetching .well-known info for domain:", domain)
data = {}
try:
- res = reqto.get(f"https://{domain}/.well-known/nodeinfo", headers=api_headers, timeout=(config["connection_timeout"], config["read_timeout"]))
+ response = network.fetch_response(domain, "/.well-known/nodeinfo", network.api_headers, (config.get("nodeinfo_connection_timeout"), config.get("nodeinfo_read_timeout")))
- data = res.json()
- # DEBUG: print("DEBUG: domain,res.ok,data[]:", domain, res.ok, type(data))
- if res.ok and isinstance(data, dict):
+ data = json_from_response(response)
+ # DEBUG: print("DEBUG: domain,response.ok,data[]:", domain, response.ok, type(data))
+ if response.ok and isinstance(data, dict):
nodeinfo = data
# DEBUG: print("DEBUG: Found entries:", len(nodeinfo), domain)
if "links" in nodeinfo:
@@ -889,23 +488,23 @@ def fetch_wellknown_nodeinfo(domain: str) -> list:
# DEBUG: print("DEBUG: rel,href:", link["rel"], link["href"])
if link["rel"] in nodeinfo_identifier:
# DEBUG: print("DEBUG: Fetching nodeinfo from:", link["href"])
- res = reqto.get(link["href"])
+ response = fetch_url(link["href"], network.api_headers, (config.get("connection_timeout"), config.get("read_timeout")))
- data = res.json()
- # DEBUG: print("DEBUG: href,res.ok,res.status_code:", link["href"], res.ok, res.status_code)
- if res.ok and isinstance(data, dict):
+ data = json_from_response(response)
+ # DEBUG: print("DEBUG: href,response.ok,response.status_code:", link["href"], response.ok, response.status_code)
+ if response.ok and isinstance(data, dict):
# DEBUG: print("DEBUG: Found JSON nodeinfo():", len(data))
- set_instance_data("detection_mode", domain, "AUTO_DISCOVERY")
- set_instance_data("nodeinfo_url" , domain, link["href"])
+ instances.set_data("detection_mode", domain, "AUTO_DISCOVERY")
+ instances.set_data("nodeinfo_url" , domain, link["href"])
break
else:
print("WARNING: Unknown 'rel' value:", domain, link["rel"])
else:
print("WARNING: nodeinfo does not contain 'links':", domain)
- except BaseException as e:
+ except BaseException as exc:
print("WARNING: Failed fetching .well-known info:", domain)
- update_last_error(domain, e)
+ instances.update_last_error(domain, exc)
pass
# DEBUG: print("DEBUG: Returning data[]:", type(data))
@@ -913,26 +512,26 @@ def fetch_wellknown_nodeinfo(domain: str) -> list:
def fetch_generator_from_path(domain: str, path: str = "/") -> str:
# DEBUG: print(f"DEBUG: domain({len(domain)})={domain},path={path} - CALLED!")
- if type(domain) != str:
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(path) != str:
+ raise ValueError("Parameter 'domain' is empty")
+ elif not isinstance(path, str):
raise ValueError(f"path[]={type(path)} is not 'str'")
elif path == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
+ raise ValueError("Parameter 'path' is empty")
# DEBUG: print(f"DEBUG: domain='{domain}',path='{path}' - CALLED!")
software = None
try:
# DEBUG: print(f"DEBUG: Fetching path='{path}' from '{domain}' ...")
- res = reqto.get(f"https://{domain}{path}", headers=headers, timeout=(config["connection_timeout"], config["read_timeout"]))
+ response = network.fetch_response(domain, path, network.web_headers, (config.get("connection_timeout"), config.get("read_timeout")))
- # DEBUG: print("DEBUG: domain,res.ok,res.status_code,res.text[]:", domain, res.ok, res.status_code, type(res.text))
- if res.ok and res.status_code < 300 and len(res.text) > 0:
+ # DEBUG: print("DEBUG: domain,response.ok,response.status_code,response.text[]:", domain, response.ok, response.status_code, type(response.text))
+ if response.ok and response.status_code < 300 and len(response.text) > 0:
# DEBUG: print("DEBUG: Search for :", domain)
- doc = bs4.BeautifulSoup(res.text, "html.parser")
+ doc = bs4.BeautifulSoup(response.text, "html.parser")
# DEBUG: print("DEBUG: doc[]:", type(doc))
generator = doc.find("meta", {"name": "generator"})
@@ -943,39 +542,39 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
# DEBUG: print("DEBUG: Found generator meta tag:", domain)
software = tidyup_domain(generator.get("content"))
print(f"INFO: domain='{domain}' is generated by '{software}'")
- set_instance_data("detection_mode", domain, "GENERATOR")
+ instances.set_data("detection_mode", domain, "GENERATOR")
remove_pending_error(domain)
elif isinstance(site_name, bs4.element.Tag):
# DEBUG: print("DEBUG: Found property=og:site_name:", domain)
sofware = tidyup_domain(site_name.get("content"))
print(f"INFO: domain='{domain}' has og:site_name='{software}'")
- set_instance_data("detection_mode", domain, "SITE_NAME")
+ instances.set_data("detection_mode", domain, "SITE_NAME")
remove_pending_error(domain)
- except BaseException as e:
- # DEBUG: print(f"DEBUG: Cannot fetch / from '{domain}':", e)
- update_last_error(domain, e)
+ except BaseException as exc:
+ # DEBUG: print(f"DEBUG: Cannot fetch / from '{domain}':", exc)
+ instances.update_last_error(domain, exc)
pass
# DEBUG: print(f"DEBUG: software[]={type(software)}")
- if type(software) is str and software == "":
+ if isinstance(software, str) and software == "":
# DEBUG: print(f"DEBUG: Corrected empty string to None for software of domain='{domain}'")
software = None
- elif type(software) is str and ("." in software or " " in software):
+ elif isinstance(software, str) and ("." in software or " " in software):
# DEBUG: print(f"DEBUG: software='{software}' may contain a version number, domain='{domain}', removing it ...")
software = remove_version(software)
# DEBUG: print(f"DEBUG: software[]={type(software)}")
- if type(software) is str and " powered by " in software:
+ if isinstance(software, str) and " powered by " in software:
# DEBUG: print(f"DEBUG: software='{software}' has 'powered by' in it")
software = remove_version(strip_powered_by(software))
- elif type(software) is str and " hosted on " in software:
+ elif isinstance(software, str) and " hosted on " in software:
# DEBUG: print(f"DEBUG: software='{software}' has 'hosted on' in it")
software = remove_version(strip_hosted_on(software))
- elif type(software) is str and " by " in software:
+ elif isinstance(software, str) and " by " in software:
# DEBUG: print(f"DEBUG: software='{software}' has ' by ' in it")
software = strip_until(software, " by ")
- elif type(software) is str and " see " in software:
+ elif isinstance(software, str) and " see " in software:
# DEBUG: print(f"DEBUG: software='{software}' has ' see ' in it")
software = strip_until(software, " see ")
@@ -984,11 +583,11 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
def determine_software(domain: str, path: str = None) -> str:
# DEBUG: print(f"DEBUG: domain({len(domain)})={domain},path={path} - CALLED!")
- if type(domain) != str:
+ if not isinstance(domain, str):
raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(path) != str and path != None:
+ raise ValueError("Parameter 'domain' is empty")
+ elif not isinstance(path, str) and path is not None:
raise ValueError(f"Parameter path[]={type(path)} is not 'str'")
# DEBUG: print("DEBUG: Determining software for domain,path:", domain, path)
@@ -1005,11 +604,11 @@ def determine_software(domain: str, path: str = None) -> str:
# DEBUG: print("DEBUG: data():", len(data), data)
if "status" in data and data["status"] == "error" and "message" in data:
print("WARNING: JSON response is an error:", data["message"])
- update_last_error(domain, data["message"])
+ instances.update_last_error(domain, data["message"])
return fetch_generator_from_path(domain)
elif "message" in data:
print("WARNING: JSON response contains only a message:", data["message"])
- update_last_error(domain, data["message"])
+ instances.update_last_error(domain, data["message"])
return fetch_generator_from_path(domain)
elif "software" not in data or "name" not in data["software"]:
# DEBUG: print(f"DEBUG: JSON response from domain='{domain}' does not include [software][name], fetching / ...")
@@ -1032,17 +631,17 @@ def determine_software(domain: str, path: str = None) -> str:
software = "misskey"
elif software.find("/") > 0:
print("WARNING: Spliting of slash:", software)
- software = software.split("/")[-1];
+ software = tidyup_domain(software.split("/")[-1])
elif software.find("|") > 0:
print("WARNING: Spliting of pipe:", software)
- software = tidyup_domain(software.split("|")[0]);
+ software = tidyup_domain(software.split("|")[0])
elif "powered by" in software:
# DEBUG: print(f"DEBUG: software='{software}' has 'powered by' in it")
software = strip_powered_by(software)
- elif type(software) is str and " by " in software:
+ elif isinstance(software, str) and " by " in software:
# DEBUG: print(f"DEBUG: software='{software}' has ' by ' in it")
software = strip_until(software, " by ")
- elif type(software) is str and " see " in software:
+ elif isinstance(software, str) and " see " in software:
# DEBUG: print(f"DEBUG: software='{software}' has ' see ' in it")
software = strip_until(software, " see ")
@@ -1060,484 +659,39 @@ def determine_software(domain: str, path: str = None) -> str:
software = remove_version(software)
# DEBUG: print(f"DEBUG: software[]={type(software)}")
- if type(software) is str and "powered by" in software:
+ if isinstance(software, str) and "powered by" in software:
# DEBUG: print(f"DEBUG: software='{software}' has 'powered by' in it")
software = remove_version(strip_powered_by(software))
# DEBUG: print("DEBUG: Returning domain,software:", domain, software)
return software
-def update_block_reason(reason: str, blocker: str, blocked: str, block_level: str):
- # DEBUG: print(f"DEBUG: reason='{reason}',blocker={blocker},blocked={blocked},block_level={block_level} - CALLED!")
- if type(reason) != str and reason != None:
- raise ValueError(f"Parameter reason[]='{type(reason)}' is not 'str'")
- elif type(blocker) != str:
- raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not 'str'")
- elif type(blocked) != str:
- raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not 'str'")
- elif type(block_level) != str:
- raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
-
- # DEBUG: print("DEBUG: Updating block reason:", reason, blocker, blocked, block_level)
- try:
- cursor.execute(
- "UPDATE blocks SET reason = ?, last_seen = ? WHERE blocker = ? AND blocked = ? AND block_level = ? AND reason IN ('','unknown') LIMIT 1",
- (
- reason,
- time.time(),
- blocker,
- blocked,
- block_level
- ),
- )
-
- # DEBUG: print(f"DEBUG: cursor.rowcount={cursor.rowcount}")
- if cursor.rowcount == 0:
- # DEBUG: print(f"DEBUG: Did not update any rows: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',reason='{reason}' - EXIT!")
- return
-
- except BaseException as e:
- print(f"ERROR: failed SQL query: reason='{reason}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
- sys.exit(255)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def update_last_seen(blocker: str, blocked: str, block_level: str):
- # DEBUG: print("DEBUG: Updating last_seen for:", blocker, blocked, block_level)
- try:
- cursor.execute(
- "UPDATE blocks SET last_seen = ? WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
- (
- time.time(),
- blocker,
- blocked,
- block_level
- )
- )
-
- # DEBUG: print(f"DEBUG: cursor.rowcount={cursor.rowcount}")
- if cursor.rowcount == 0:
- # DEBUG: print(f"DEBUG: Did not update any rows: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}' - EXIT!")
- return
-
- except BaseException as e:
- print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
- sys.exit(255)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def is_instance_blocked(blocker: str, blocked: str, block_level: str) -> bool:
- # DEBUG: print(f"DEBUG: blocker={blocker},blocked={blocked},block_level={block_level} - CALLED!")
- if type(blocker) != str:
- raise ValueError(f"Parameter blocker[]={type(blocker)} is not of type 'str'")
- elif blocker == "":
- raise ValueError("Parameter 'blocker' cannot be empty")
- elif type(blocked) != str:
- raise ValueError(f"Parameter blocked[]={type(blocked)} is not of type 'str'")
- elif blocked == "":
- raise ValueError("Parameter 'blocked' cannot be empty")
- elif type(block_level) != str:
- raise ValueError(f"Parameter block_level[]={type(block_level)} is not of type 'str'")
- elif block_level == "":
- raise ValueError("Parameter 'block_level' cannot be empty")
-
- cursor.execute(
- "SELECT * FROM blocks WHERE blocker = ? AND blocked = ? AND block_level = ? LIMIT 1",
- (
- blocker,
- blocked,
- block_level
- ),
- )
-
- is_blocked = cursor.fetchone() != None
-
- # DEBUG: print(f"DEBUG: is_blocked='{is_blocked}' - EXIT!")
- return is_blocked
-
-def block_instance(blocker: str, blocked: str, reason: str, block_level: str):
- # DEBUG: print("DEBUG: blocker,blocked,reason,block_level:", blocker, blocked, reason, block_level)
- if type(blocker) != str:
- raise ValueError(f"Parameter blocker[]={type(blocker)} is not 'str'")
- elif blocker == "":
- raise ValueError(f"Parameter 'blocker' cannot be empty")
- elif not validators.domain(blocker.split("/")[0]):
- raise ValueError(f"Bad blocker='{blocker}'")
- elif type(blocked) != str:
- raise ValueError(f"Parameter blocked[]={type(blocked)} is not 'str'")
- elif blocked == "":
- raise ValueError(f"Parameter 'blocked' cannot be empty")
- elif not validators.domain(blocked.split("/")[0]):
- raise ValueError(f"Bad blocked='{blocked}'")
- elif is_blacklisted(blocker):
- raise Exception(f"blocker='{blocker}' is blacklisted but function invoked")
- elif is_blacklisted(blocked):
- raise Exception(f"blocked='{blocked}' is blacklisted but function invoked")
-
- print(f"INFO: New block: blocker='{blocker}',blocked='{blocked}', reason='{reason}', block_level='{block_level}'")
- try:
- cursor.execute(
- "INSERT INTO blocks (blocker, blocked, reason, block_level, first_seen, last_seen) VALUES(?, ?, ?, ?, ?, ?)",
- (
- blocker,
- blocked,
- reason,
- block_level,
- time.time(),
- time.time()
- ),
- )
-
- connection.commit()
- except BaseException as e:
- print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',reason='{reason}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
- sys.exit(255)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def is_instance_registered(domain: str) -> bool:
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # NOISY-DEBUG: # DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
- if not cache.is_cache_initialized("is_registered"):
- # NOISY-DEBUG: # DEBUG: print(f"DEBUG: Cache for 'is_registered' not initialized, fetching all rows ...")
- try:
- cursor.execute("SELECT domain FROM instances")
-
- # Check Set all
- cache.set_all_cache_key("is_registered", cursor.fetchall(), True)
- except BaseException as e:
- print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
- sys.exit(255)
-
- # Is cache found?
- registered = cache.is_cache_key_set("is_registered", domain)
-
- # NOISY-DEBUG: # DEBUG: print(f"DEBUG: registered='{registered}' - EXIT!")
- return registered
-
-def add_instance(domain: str, origin: str, originator: str, path: str = None):
- # DEBUG: print(f"DEBUG: domain={domain},origin={origin},originator={originator},path={path} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
- elif type(origin) != str and origin != None:
- raise ValueError(f"origin[]={type(origin)} is not 'str'")
- elif type(originator) != str:
- raise ValueError(f"originator[]={type(originator)} is not 'str'")
- elif originator == "":
- raise ValueError(f"originator cannot be empty")
- elif not validators.domain(domain.split("/")[0]):
- raise ValueError(f"Bad domain name='{domain}'")
- elif origin is not None and not validators.domain(origin.split("/")[0]):
- raise ValueError(f"Bad origin name='{origin}'")
- elif is_blacklisted(domain):
- raise Exception(f"domain='{domain}' is blacklisted, but method invoked")
-
- # DEBUG: print("DEBUG: domain,origin,originator,path:", domain, origin, originator, path)
- software = determine_software(domain, path)
- # DEBUG: print("DEBUG: Determined software:", software)
-
- print(f"INFO: Adding instance domain='{domain}' (origin='{origin}',software='{software}')")
- try:
- cursor.execute(
- "INSERT INTO instances (domain, origin, originator, hash, software, first_seen) VALUES (?, ?, ?, ?, ?, ?)",
- (
- domain,
- origin,
- originator,
- get_hash(domain),
- software,
- time.time()
- ),
- )
-
- cache.set_cache_key("is_registered", domain, True)
-
- if has_pending_instance_data(domain):
- # DEBUG: print(f"DEBUG: domain='{domain}' has pending nodeinfo being updated ...")
- set_instance_data("last_status_code" , domain, None)
- set_instance_data("last_error_details", domain, None)
- update_instance_data(domain)
- remove_pending_error(domain)
-
- if domain in pending_errors:
- # DEBUG: print("DEBUG: domain has pending error being updated:", domain)
- update_last_error(domain, pending_errors[domain])
- remove_pending_error(domain)
-
- except BaseException as e:
- print(f"ERROR: failed SQL query: domain='{domain}',exception[{type(e)}]:'{str(e)}'")
- sys.exit(255)
- else:
- # DEBUG: print("DEBUG: Updating nodeinfo for domain:", domain)
- update_last_nodeinfo(domain)
-
- # DEBUG: print("DEBUG: EXIT!")
-
-def send_bot_post(instance: str, blocks: dict):
- # DEBUG: print(f"DEBUG: instance={instance},blocks()={len(blocks)} - CALLED!")
- message = instance + " has blocked the following instances:\n\n"
- truncated = False
-
- if len(blocks) > 20:
- truncated = True
- blocks = blocks[0 : 19]
-
- for block in blocks:
- if block["reason"] == None or block["reason"] == '':
- message = message + block["blocked"] + " with unspecified reason\n"
- else:
- if len(block["reason"]) > 420:
- block["reason"] = block["reason"][0:419] + "[â¦]"
-
- message = message + block["blocked"] + ' for "' + block["reason"].replace("@", "@\u200b") + '"\n'
-
- if truncated:
- message = message + "(the list has been truncated to the first 20 entries)"
+def tidyup_reason(reason: str) -> str:
+ # DEBUG: print(f"DEBUG: reason='{reason}' - CALLED!")
+ if not isinstance(reason, str):
+ raise ValueError(f"Parameter reason[]={type(reason)} is not 'str'")
- botheaders = {**api_headers, **{"Authorization": "Bearer " + config["bot_token"]}}
+ # Strip string
+ reason = reason.strip()
- req = reqto.post(
- f"{config['bot_instance']}/api/v1/statuses",
- data={
- "status" : message,
- "visibility" : config['bot_visibility'],
- "content_type": "text/plain"
- },
- headers=botheaders,
- timeout=10
- ).json()
+ # Replace â with "
+ reason = re.sub("â", "\"", reason)
- return True
-
-def get_mastodon_blocks(domain: str) -> dict:
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: Fetching mastodon blocks from domain:", domain)
- blocks = {
- "Suspended servers": [],
- "Filtered media" : [],
- "Limited servers" : [],
- "Silenced servers" : [],
- }
-
- try:
- doc = bs4.BeautifulSoup(
- reqto.get(f"https://{domain}/about", headers=headers, timeout=(config["connection_timeout"], config["read_timeout"])).text,
- "html.parser",
- )
- except BaseException as e:
- print("ERROR: Cannot fetch from domain:", domain, e)
- update_last_error(domain, e)
- return {}
-
- for header in doc.find_all("h3"):
- header_text = tidyup_domain(header.text)
-
- if header_text in language_mapping:
- # DEBUG: print(f"DEBUG: header_text='{header_text}'")
- header_text = language_mapping[header_text]
-
- if header_text in blocks or header_text.lower() in blocks:
- # replaced find_next_siblings with find_all_next to account for instances that e.g. hide lists in dropdown menu
- for line in header.find_all_next("table")[0].find_all("tr")[1:]:
- blocks[header_text].append(
- {
- "domain": tidyup_domain(line.find("span").text),
- "hash" : tidyup_domain(line.find("span")["title"][9:]),
- "reason": tidyup_domain(line.find_all("td")[1].text),
- }
- )
-
- # DEBUG: print("DEBUG: Returning blocks for domain:", domain)
- return {
- "reject" : blocks["Suspended servers"],
- "media_removal" : blocks["Filtered media"],
- "followers_only": blocks["Limited servers"] + blocks["Silenced servers"],
- }
-
-def get_friendica_blocks(domain: str) -> dict:
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: Fetching friendica blocks from domain:", domain)
- blocks = []
-
- try:
- doc = bs4.BeautifulSoup(
- reqto.get(f"https://{domain}/friendica", headers=headers, timeout=(config["connection_timeout"], config["read_timeout"])).text,
- "html.parser",
- )
- except BaseException as e:
- print("WARNING: Failed to fetch /friendica from domain:", domain, e)
- update_last_error(domain, e)
- return {}
-
- blocklist = doc.find(id="about_blocklist")
-
- # Prevents exceptions:
- if blocklist is None:
- # DEBUG: print("DEBUG: Instance has no block list:", domain)
- return {}
-
- for line in blocklist.find("table").find_all("tr")[1:]:
- # DEBUG: print(f"DEBUG: line='{line}'")
- blocks.append({
- "domain": tidyup_domain(line.find_all("td")[0].text),
- "reason": tidyup_domain(line.find_all("td")[1].text)
- })
-
- # DEBUG: print("DEBUG: Returning blocks() for domain:", domain, len(blocks))
- return {
- "reject": blocks
- }
-
-def get_misskey_blocks(domain: str) -> dict:
- # DEBUG: print(f"DEBUG: domain={domain} - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- elif domain == "":
- raise ValueError(f"Parameter 'domain' cannot be empty")
-
- # DEBUG: print("DEBUG: Fetching misskey blocks from domain:", domain)
- blocks = {
- "suspended": [],
- "blocked" : []
- }
-
- offset = 0
- step = config["misskey_offset"]
- while True:
- # iterating through all "suspended" (follow-only in its terminology)
- # instances page-by-page, since that troonware doesn't support
- # sending them all at once
- try:
- # DEBUG: print(f"DEBUG: Fetching offset='{offset}' from '{domain}' ...")
- if offset == 0:
- # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
- fetched = post_json_api(domain, "/api/federation/instances", json.dumps({
- "sort" : "+pubAt",
- "host" : None,
- "suspended": True,
- "limit" : step
- }), {"Origin": domain})
- else:
- # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
- fetched = post_json_api(domain, "/api/federation/instances", json.dumps({
- "sort" : "+pubAt",
- "host" : None,
- "suspended": True,
- "limit" : step,
- "offset" : offset - 1
- }), {"Origin": domain})
-
- # DEBUG: print("DEBUG: fetched():", len(fetched))
- if len(fetched) == 0:
- # DEBUG: print("DEBUG: Returned zero bytes, exiting loop:", domain)
- break
- elif len(fetched) != config["misskey_offset"]:
- # DEBUG: print(f"DEBUG: Fetched '{len(fetched)}' row(s) but expected: '{config['misskey_offset']}'")
- offset = offset + (config["misskey_offset"] - len(fetched))
- else:
- # DEBUG: print("DEBUG: Raising offset by step:", step)
- offset = offset + step
-
- for instance in fetched:
- # just in case
- if instance["isSuspended"]:
- blocks["suspended"].append(
- {
- "domain": tidyup_domain(instance["host"]),
- # no reason field, nothing
- "reason": None
- }
- )
-
- except BaseException as e:
- print("WARNING: Caught error, exiting loop:", domain, e)
- update_last_error(domain, e)
- offset = 0
- break
-
- while True:
- # same shit, different asshole ("blocked" aka full suspend)
- try:
- if offset == 0:
- # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
- fetched = post_json_api(domain,"/api/federation/instances", json.dumps({
- "sort" : "+pubAt",
- "host" : None,
- "blocked": True,
- "limit" : step
- }), {"Origin": domain})
- else:
- # DEBUG: print("DEBUG: Sending JSON API request to domain,step,offset:", domain, step, offset)
- fetched = post_json_api(domain,"/api/federation/instances", json.dumps({
- "sort" : "+pubAt",
- "host" : None,
- "blocked": True,
- "limit" : step,
- "offset" : offset-1
- }), {"Origin": domain})
-
- # DEBUG: print("DEBUG: fetched():", len(fetched))
- if len(fetched) == 0:
- # DEBUG: print("DEBUG: Returned zero bytes, exiting loop:", domain)
- break
- elif len(fetched) != config["misskey_offset"]:
- # DEBUG: print(f"DEBUG: Fetched '{len(fetched)}' row(s) but expected: '{config['misskey_offset']}'")
- offset = offset + (config["misskey_offset"] - len(fetched))
- else:
- # DEBUG: print("DEBUG: Raising offset by step:", step)
- offset = offset + step
-
- for instance in fetched:
- if instance["isBlocked"]:
- blocks["blocked"].append({
- "domain": tidyup_domain(instance["host"]),
- "reason": None
- })
-
- except BaseException as e:
- print("ERROR: Exception during POST:", domain, e)
- update_last_error(domain, e)
- offset = 0
- break
-
- # DEBUG: print(f"DEBUG: Updating last_instance_fetch for domain='{domain}' ...")
- update_last_instance_fetch(domain)
-
- # DEBUG: print("DEBUG: Returning for domain,blocked(),suspended():", domain, len(blocks["blocked"]), len(blocks["suspended"]))
- return {
- "reject" : blocks["blocked"],
- "followers_only": blocks["suspended"]
- }
+ # DEBUG: print(f"DEBUG: reason='{reason}' - EXIT!")
+ return reason
def tidyup_domain(domain: str) -> str:
# DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
- if type(domain) != str:
- raise ValueError(f"Parameter domain[]={type(domain)} is not expected")
+ if not isinstance(domain, str):
+ raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
- # All lower-case and strip spaces out
- domain = domain.lower().strip()
+ # All lower-case and strip spaces out + last dot
+ domain = domain.lower().strip().rstrip(".")
# No port number
domain = re.sub("\:\d+$", "", domain)
- # No protocol, sometimes with the slashes
+ # No protocol, sometimes without the slashes
domain = re.sub("^https?\:(\/*)", "", domain)
# No trailing slash
@@ -1548,6 +702,124 @@ def tidyup_domain(domain: str) -> str:
# No individual users in block lists
domain = re.sub("(.+)\@", "", domain)
+ if domain.find("/profile/"):
+ domain = domain.split("/profile/")[0]
+ elif domain.find("/users/"):
+ domain = domain.split("/users/")[0]
# DEBUG: print(f"DEBUG: domain='{domain}' - EXIT!")
return domain
+
+def json_from_response(response: requests.models.Response) -> list:
+ # DEBUG: print(f"DEBUG: response[]={type(response)} - CALLED!")
+ if not isinstance(response, requests.models.Response):
+ raise ValueError(f"Parameter response[]='{type(response)}' is not type of 'Response'")
+
+ data = list()
+ if response.text.strip() != "":
+ # DEBUG: print(f"DEBUG: response.text()={len(response.text)} is not empty, invoking response.json() ...")
+ try:
+ data = response.json()
+ except json.decoder.JSONDecodeError:
+ pass
+
+ # DEBUG: print(f"DEBUG: data[]={type(data)} - EXIT!")
+ return data
+
+def has_key(lists: list, key: str, value: any) -> bool:
+ # DEBUG: print(f"DEBUG: lists()={len(lists)},key='{key}',value[]='{type(value)}' - CALLED!")
+ if not isinstance(lists, list):
+ raise ValueError(f"Parameter lists[]='{type(lists)}' is not 'list'")
+ elif not isinstance(key, str):
+ raise ValueError(f"Parameter key[]='{type(key)}' is not 'str'")
+ elif key == "":
+ raise ValueError("Parameter 'key' is empty")
+
+ has = False
+ # DEBUG: print(f"DEBUG: Checking lists()={len(lists)} ...")
+ for row in lists:
+ # DEBUG: print(f"DEBUG: row['{type(row)}']={row}")
+ if not isinstance(row, dict):
+ raise ValueError(f"row[]='{type(row)}' is not 'dict'")
+ elif not key in row:
+ raise KeyError(f"Cannot find key='{key}'")
+ elif row[key] == value:
+ has = True
+ break
+
+ # DEBUG: print(f"DEBUG: has={has} - EXIT!")
+ return has
+
+def find_domains(tag: bs4.element.Tag) -> list:
+ # DEBUG: print(f"DEBUG: tag[]={type(tag)} - CALLED!")
+ if not isinstance(tag, bs4.element.Tag):
+ raise ValueError(f"Parameter tag[]={type(tag)} is not type of bs4.element.Tag")
+ elif len(tag.select("tr")) == 0:
+ raise KeyError("No table rows found in table!")
+
+ domains = list()
+ for element in tag.select("tr"):
+ # DEBUG: print(f"DEBUG: element[]={type(element)}")
+ if not element.find("td"):
+ # DEBUG: print("DEBUG: Skipping element, no
found")
+ continue
+
+ domain = tidyup_domain(element.find("td").text)
+ reason = tidyup_reason(element.findAll("td")[1].text)
+
+ # DEBUG: print(f"DEBUG: domain='{domain}',reason='{reason}'")
+
+ if blacklist.is_blacklisted(domain):
+ print(f"WARNING: domain='{domain}' is blacklisted - skipped!")
+ continue
+ elif domain == "gab.com/.ai, develop.gab.com":
+ # DEBUG: print("DEBUG: Multiple domains detected in one row")
+ domains.append({
+ "domain": "gab.com",
+ "reason": reason,
+ })
+ domains.append({
+ "domain": "gab.ai",
+ "reason": reason,
+ })
+ domains.append({
+ "domain": "develop.gab.com",
+ "reason": reason,
+ })
+ continue
+ elif not validators.domain(domain):
+ print(f"WARNING: domain='{domain}' is not a valid domain - skipped!")
+ continue
+
+ # DEBUG: print(f"DEBUG: Adding domain='{domain}' ...")
+ domains.append({
+ "domain": domain,
+ "reason": reason,
+ })
+
+ # DEBUG: print(f"DEBUG: domains()={len(domains)} - EXIT!")
+ return domains
+
+def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Response:
+ # DEBUG: print(f"DEBUG: url='{url}',headers()={len(headers)},timeout={timeout} - CALLED!")
+ if not isinstance(url, str):
+ raise ValueError(f"Parameter url[]='{type(url)}' is not 'str'")
+ elif url == "":
+ raise ValueError("Parameter 'url' is empty")
+ elif not isinstance(headers, dict):
+ raise ValueError(f"Parameter headers[]='{type(headers)}' is not 'dict'")
+ elif not isinstance(timeout, tuple):
+ raise ValueError(f"Parameter timeout[]='{type(timeout)}' is not 'tuple'")
+
+ # DEBUG: print(f"DEBUG: Parsing url='{url}'")
+ components = urlparse(url)
+
+ # Invoke other function, avoid trailing ?
+ # DEBUG: print(f"DEBUG: components[{type(components)}]={components}")
+ if components.query != "":
+ response = network.fetch_response(components.hostname, f"{components.path}?{components.query}", headers, timeout)
+ else:
+ response = network.fetch_response(components.hostname, f"{components.path}", headers, timeout)
+
+ # DEBUG: print(f"DEBUG: response[]='{type(response)}' - EXXIT!")
+ return response
|