Continued:

- rewrote more f-masked logger messages to lazy '%'
- blacklisted grossard.fr: please don't send tons of garbage!
- instances.deobsfucate() should not validate domains as this is always invalid

diff --git a/fba/helpers/blacklist.py b/fba/helpers/blacklist.py
index b223773c11d12a929ae782b49fe3eed987dd090d..0a74eb1f6d8d0ba53a3855422f0cb001a299207d 100644 (file)
--- a/fba/helpers/blacklist.py
+++ b/fba/helpers/blacklist.py
@@ -39,6 +39,8 @@ blacklist = [
     "misskeytest.chn.moe",
     # block flooder
     "everyoneattack.com",
+    # responds with very long reply
+    "grossard.fr",
 ]
 
 def is_blacklisted(domain: str) -> bool:

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 89d22c3dc1eea2bb97b030603185c80caff10e2b..5ac5cfccb768a5ad695e67569999329f46f7bd55 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -106,7 +106,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
         logger.debug(f"instance='{instance}' - AFTER")
 
         if instance == "":
-            logger.warning(f"Empty instance after tidyup.domain(), domain='{domain}'")
+            logger.warning("Empty instance after tidyup.domain(), domain='%s'", domain)
             continue
         elif not utils.is_domain_wanted(instance):
             logger.debug("instance='%s' is not wanted - SKIPPED!", instance)
@@ -115,7 +115,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
             logger.debug("instance='%s' is a link to a single user profile - SKIPPED!", instance)
             continue
         elif not instances.is_registered(instance):
-            logger.debug("Adding new instance:", instance, domain)
+            logger.debug("Adding new instance='%s',domain='%s',command='%s'", instance, domain, command)
             instances.add(instance, domain, command)
 
     logger.debug("EXIT!")
@@ -147,7 +147,7 @@ def fetch_peers(domain: str, software: str) -> list:
         logger.debug("Checking CSRF for domain='%s'", domain)
         headers = csrf.determine(domain, dict())
     except network.exceptions as exception:
-        logger.warning(f"Exception '{type(exception)}' during checking CSRF (fetch_peers,{__name__}) - EXIT!")
+        logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s) - EXIT!", type(exception), __name__)
         instances.set_last_error(domain, exception)
         return peers
 
@@ -171,9 +171,9 @@ def fetch_peers(domain: str, software: str) -> list:
 
         logger.debug("data[]='%s'", type(data))
         if "error_message" in data:
-            logger.warning(f"Could not reach any JSON API at domain='{domain}',status_code='{data['status_code']}',error_message='{data['error_message']}'")
+            logger.warning("Could not reach any JSON API at domain='%s',status_code='%d',error_message='%s'", domain, data['status_code'], data['error_message'])
         elif "federated_instances" in data["json"]:
-            logger.debug(f"Found federated_instances for domain='{domain}'")
+            logger.debug("Found federated_instances for domain='%s'", domain)
             peers = peers + add_peers(data["json"]["federated_instances"])
             logger.debug("Added instance(s) to peers")
         else:
@@ -493,7 +493,7 @@ def determine_software(domain: str, path: str = None) -> str:
         logger.debug("software='%s' has 'powered by' in it", software)
         software = version.remove(version.strip_powered_by(software))
 
-    logger.debug("Returning domain='%s',software='%s'", domain, software)
+    logger.debug("software='%s' - EXIT!", domain, software)
     return software
 
 def find_domains(tag: bs4.element.Tag) -> list:

diff --git a/fba/http/network.py b/fba/http/network.py
index 88a715ac4470c47680a54732157cfa8b818d91d0..2ac9a4e5fa130fbdd6efd90295d7683147d6287f 100644 (file)
--- a/fba/http/network.py
+++ b/fba/http/network.py
@@ -55,8 +55,8 @@ exceptions = (
     urllib3.exceptions.LocationParseError
 )
 
-def post_json_api(domain: str, path: str, data: str = "", headers: dict = {}) -> dict:
-    logger.debug(f"domain='{domain}',path='{path}',data='{data}',headers()={len(headers)} - CALLED!")
+def post_json_api(domain: str, path: str, data: str = "", headers: dict = dict()) -> dict:
+    logger.debug("domain='%s',path='%s',data='%s',headers()=%d - CALLED!", domain, path, data, len(headers))
     domain_helper.raise_on(domain)
 
     if not isinstance(path, str):
@@ -84,29 +84,31 @@ def post_json_api(domain: str, path: str, data: str = "", headers: dict = {}) ->
 
         json_reply["json"] = json_from_response(response)
 
-        logger.debug(f"response.ok={response.ok},response.status_code={response.status_code},json_reply[]='{type(json_reply)}'")
+        logger.debug("response.ok='%s',response.status_code='%d',json_reply[]='%s'", response.ok, response.status_code, type(json_reply))
         if not response.ok or response.status_code >= 400:
-            logger.warning(f"Cannot query JSON API: domain='{domain}',path='{path}',data()={len(data)},response.status_code='{response.status_code}',json_reply[]='{type(json_reply)}'")
+            logger.warning("Cannot query JSON API: domain='%s',path='%s',data()=%d,response.status_code='%d',json_reply[]='%s'", domain, path, len(data), response.status_code, type(json_reply))
             json_reply["status_code"]   = response.status_code
             json_reply["error_message"] = response.reason
             del json_reply["json"]
             instances.set_last_error(domain, response)
 
     except exceptions as exception:
-        logger.debug(f"Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
+        logger.debug("Fetching path='%s' from domain='%s' failed. exception[%s]='%s'", path, domain, type(exception), str(exception))
         json_reply["status_code"]   = 999
         json_reply["error_message"] = f"exception['{type(exception)}']='{str(exception)}'"
         json_reply["exception"]     = exception
         instances.set_last_error(domain, exception)
         raise exception
 
-    logger.debug(f"Returning json_reply({len(json_reply)})=[]:{type(json_reply)}")
+    logger.debug("Returning json_reply(%d)[]='%s' - EXIT!", len(json_reply), type(json_reply))
     return json_reply
 
 def fetch_api_url(url: str, timeout: tuple) -> dict:
-    logger.debug(f"url='{url}',timeout()={len(timeout)} - CALLED!")
+    logger.debug("url='%s',timeout()=%d - CALLED!", url, len(timeout))
     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(timeout, tuple):
         raise ValueError(f"timeout[]='{type(timeout)}' is not 'tuple'")
 
@@ -120,25 +122,25 @@ def fetch_api_url(url: str, timeout: tuple) -> dict:
 
         json_reply["json"] = json_from_response(response)
 
-        logger.debug(f"response.ok={response.ok},response.status_code={response.status_code},json_reply[]='{type(json_reply)}'")
+        logger.debug("response.ok='%s',response.status_code='%s',json_reply[]='%s'", response.ok, response.status_code, type(json_reply))
         if not response.ok or response.status_code >= 400:
-            logger.warning(f"Cannot query JSON API: url='{url}',response.status_code='{response.status_code}',json_reply[]='{type(json_reply)}'")
+            logger.warning("Cannot query JSON API: url='%s',response.status_code='%d',json_reply[]='%s'", url, response.status_code, type(json_reply))
             json_reply["status_code"]   = response.status_code
             json_reply["error_message"] = response.reason
             del json_reply["json"]
 
     except exceptions as exception:
-        logger.debug(f"Fetching '{url}' failed. exception[{type(exception)}]='{str(exception)}'")
+        logger.debug("Fetching url='%s' failed. exception[%s]='%s'", url, type(exception), str(exception))
         json_reply["status_code"]   = 999
         json_reply["error_message"] = f"exception['{type(exception)}']='{str(exception)}'"
         json_reply["exception"]     = exception
         raise exception
 
-    logger.debug(f"Returning json_reply({len(json_reply)})=[]:{type(json_reply)}")
+    logger.debug("Returning json_reply(%d)[]='%s' - EXIT!", len(json_reply), type(json_reply))
     return json_reply
 
 def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
-    logger.debug(f"domain='{domain}',path='{path}',timeout()={len(timeout)} - CALLED!")
+    logger.debug("domain='%s',path='%s',timeout()=%d - CALLED!", domain, path, len(timeout))
     domain_helper.raise_on(domain)
 
     if not isinstance(path, str):
@@ -173,19 +175,19 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
 
     json_reply["json"] = json_from_response(response)
 
-    logger.debug(f"response.ok={response.ok},response.status_code={response.status_code},json_reply[]='{type(json_reply)}'")
+    logger.debug("response.ok='%s',response.status_code='%d',json_reply[]='%s'", response.ok, response.status_code, type(json_reply))
     if not response.ok or response.status_code >= 400:
-        logger.warning(f"Cannot query JSON API: domain='{domain}',path='{path}',response.status_code='{response.status_code}',json_reply[]='{type(json_reply)}'")
+        logger.warning("Cannot query JSON API: domain='%s',path='%s',response.status_code='%d',json_reply[]='%s'", domain, path, response.status_code, type(json_reply))
         json_reply["status_code"]   = response.status_code
         json_reply["error_message"] = response.reason
         del json_reply["json"]
         instances.set_last_error(domain, response)
 
-    logger.debug(f"Returning json_reply({len(json_reply)})=[]:{type(json_reply)}")
+    logger.debug("Returning json_reply(%d)[]='%s' - EXIT!", len(json_reply), type(json_reply))
     return json_reply
 
 def send_bot_post(domain: str, blocklist: dict):
-    logger.debug(f"domain='{domain}',blocklist()={len(blocklist)} - CALLED!")
+    logger.debug("domain='%s',blocklist()=%d - CALLED!", domain, len(blocklist))
     domain_helper.raise_on(domain)
 
     if not isinstance(blocklist, dict):
@@ -198,9 +200,9 @@ def send_bot_post(domain: str, blocklist: dict):
         truncated = True
         blocklist = blocklist[0 : 19]
 
-    logger.debug(f"blocklist()={len(blocklist)}")
+    logger.debug("blocklist()=%d", len(blocklist))
     for block in blocklist:
-        logger.debug(f"block['{type(block)}']={block}")
+        logger.debug("block[%s]=%s", type(block), block)
         if block["reason"] is None or block["reason"] == '':
             message = message + block["blocked"] + " with unspecified reason\n"
         else:
@@ -228,7 +230,7 @@ def send_bot_post(domain: str, blocklist: dict):
     return True
 
 def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> requests.models.Response:
-    logger.debug(f"domain='{domain}',path='{path}',headers()={len(headers)},timeout={timeout} - CALLED!")
+    logger.debug("domain='%s',path='%s',headers()=%d,timeout='%s' - CALLED!", domain, path, len(headers), timeout)
     domain_helper.raise_on(domain)
 
     if not isinstance(path, str):
@@ -241,7 +243,7 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> req
         raise ValueError(f"timeout[]='{type(timeout)}' is not 'tuple'")
 
     try:
-        logger.debug(f"Sending GET request to '{domain}{path}' ...")
+        logger.debug("Sending GET request to '%s%s' ...", domain, path)
         response = reqto.get(
             f"https://{domain}{path}",
             headers=headers,
@@ -250,25 +252,25 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> req
         )
 
     except exceptions as exception:
-        logger.debug(f"Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
+        logger.debug("Fetching path='%s' from domain='%s' failed. exception[%s]='%s'", path, domain, type(exception), str(exception))
         instances.set_last_error(domain, exception)
         raise exception
 
-    logger.debug(f"response[]='{type(response)}' - EXXIT!")
+    logger.debug("response[]='%s' - EXIT!", type(response))
     return response
 
 def json_from_response(response: requests.models.Response) -> list:
-    logger.debug(f"response[]='{type(response)}' - CALLED!")
+    logger.debug("response[]='%s' - CALLED!", type(response))
     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() != "":
-        logger.debug(f"response.text()={len(response.text)} is not empty, invoking response.json() ...")
+        logger.debug("response.text()=%d is not empty, invoking response.json() ...", len(response.text))
         try:
             data = response.json()
         except json.decoder.JSONDecodeError:
             pass
 
-    logger.debug(f"data[]='{type(data)}' - EXIT!")
+    logger.debug("data[]='%s' - EXIT!", type(data))
     return data

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 6c2f677ebfb3f67cd1f33973a67459d8cdedc066..17c2018ef0354655583e1c55b9419d66c6ebc730 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -291,9 +291,18 @@ def is_recent(domain: str) -> bool:
 
 def deobscure(char: str, domain: str, blocked_hash: str = None) -> tuple:
     logger.debug("char='%s',domain='%s',blocked_hash='%s' - CALLED!", char, domain, blocked_hash)
-    domain_helper.raise_on(domain)
 
-    if not isinstance(char, str):
+    if not isinstance(domain, str):
+        raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
+    elif domain == "":
+        raise ValueError("Parameter 'domain' is empty")
+    elif domain.lower() != domain:
+        raise ValueError(f"Parameter domain='{domain}' must be all lower-case")
+    elif domain.endswith(".arpa"):
+        raise ValueError(f"domain='{domain}' is a domain for reversed IP addresses, please don't crawl them!")
+    elif domain.endswith(".tld"):
+        raise ValueError(f"domain='{domain}' is a fake domain, please don't crawl them!")
+    elif not isinstance(char, str):
         raise ValueError(f"Parameter char[]='{type(char)}' is not 'str'")
     elif char == "":
         raise ValueError("Parameter 'char' is empty")
@@ -306,7 +315,7 @@ def deobscure(char: str, domain: str, blocked_hash: str = None) -> tuple:
     if isinstance(blocked_hash, str):
         logger.debug("Looking up blocked_hash='%s',domain='%s' ...", blocked_hash, domain)
         database.cursor.execute(
-            "SELECT domain, origin, nodeinfo_url FROM instances WHERE hash = ? OR domain LIKE ? LIMIT 1", [blocked_hash, domain.replace("_")]
+            "SELECT domain, origin, nodeinfo_url FROM instances WHERE hash = ? OR domain LIKE ? LIMIT 1", [blocked_hash, domain.replace(char, "_")]
         )
 
         row = database.cursor.fetchone()

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index 4b2147e4cc8c07707af2686ee34c4b024623e1c5..0af8a5baaa1534627305596f7151804c49621d9b 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -88,7 +88,7 @@ def fetch_blocks(domain: str) -> dict:
         })
         logger.debug("Next!")
 
-    logger.debug("Returning blocklist() for domain:", domain, len(blocklist))
+    logger.debug("Returning blocklist()=%d for domain='%s' - EXIT!", len(blocklist), domain)
     return {
         "reject": blocklist
     }

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index 498b0f22cee085158bbeaf2c7464bbcc67596c10..686ae9d67f21f502da459b6cd9f63dfc0db2ee8d 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -87,7 +87,7 @@ def fetch_blocks_from_about(domain: str) -> dict:
                 break
 
         except network.exceptions as exception:
-            logger.warning(f"Cannot fetch from domain='{domain}',exception='{type(exception)}'")
+            logger.warning("Cannot fetch from domain='%s',exception='%s'", domain, type(exception))
             instances.set_last_error(domain, exception)
             break
 
@@ -100,7 +100,7 @@ def fetch_blocks_from_about(domain: str) -> dict:
 
     logger.debug("doc[]='%s'", type(doc))
     if doc is None:
-        logger.warning(f"Cannot fetch any /about pages for domain='{domain}' - EXIT!")
+        logger.warning("Cannot fetch any /about pages for domain='%s' - EXIT!", domain)
         return blocklist
 
     for header in doc.find_all("h3"):
@@ -108,10 +108,10 @@ def fetch_blocks_from_about(domain: str) -> dict:
 
         logger.debug("header_text='%s'", header_text)
         if header_text in language_mapping:
-            logger.debug("header_text='%s'", header_text)
+            logger.debug("Translating header_text='%s' ...", header_text)
             header_text = language_mapping[header_text]
         else:
-            logger.warning(f"header_text='{header_text}' not found in language mapping table")
+            logger.warning("header_text='%s' not found in language mapping table", header_text)
 
         if header_text in blocklist or header_text.lower() in blocklist:
             # replaced find_next_siblings with find_all_next to account for instances that e.g. hide lists in dropdown menu
@@ -122,9 +122,9 @@ def fetch_blocks_from_about(domain: str) -> dict:
                     "reason": tidyup.reason(line.find_all("td")[1].text),
                 })
         else:
-            logger.warning(f"header_text='{header_text}' not found in blocklist()={len(blocklist)}")
+            logger.warning("header_text='%s' not found in blocklist()=%d", header_text, len(blocklist))
 
-    logger.debug("Returning blocklist for domain:", domain)
+    logger.debug("Returning blocklist for domain='%s' - EXIT!", domain)
     return {
         "reject"        : blocklist["Suspended servers"],
         "media_removal" : blocklist["Filtered media"],
@@ -150,7 +150,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
         logger.debug("Checking CSRF for domain='%s'", domain)
         headers = csrf.determine(domain, dict())
     except network.exceptions as exception:
-        logger.warning(f"Exception '{type(exception)}' during checking CSRF (fetch_blocks,{__name__}) - EXIT!")
+        logger.warning("Exception '%s' during checking CSRF (fetch_blocks,%s) - EXIT!", type(exception), __name__)
         instances.set_last_error(domain, exception)
         return
 
@@ -166,7 +166,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
             "report_removal": [],
         }
 
-        logger.debug("Querying API domain_blocks:", domain)
+        logger.debug("Querying API domain_blocks: domain='%s'", domain)
         data = network.get_json_api(
             domain,
             "/api/v1/instance/domain_blocks",
@@ -180,7 +180,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
             instances.set_last_error(domain, data)
             return
         elif "json" in data and "error" in data["json"]:
-            logger.warning(f"JSON API returned error message: '{data['json']['error']}'")
+            logger.warning("JSON API returned error message: '%s'", data['json']['error'])
             instances.set_last_error(domain, data)
             return
         else:
@@ -236,11 +236,12 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                 logger.debug("domain='%s' skipping block_level='accept'", domain)
                 continue
 
-            logger.debug(f"Checking {len(blocklist)} entries from domain='{domain}',block_level='{block_level}' ...")
+            logger.debug("Checking %s entries from domain='{domain}',block_level='{block_level}' ...", len(blocklist))
             for block in blocklist:
                 logger.debug("block[]='%s'", type(block))
                 blocked, blocked_hash, reason = block.values()
-                logger.debug(f"blocked='{blocked}',blocked_hash='{blocked_hash}',reason='{reason}':")
+
+                logger.debug("blocked='%s',blocked_hash='%s',reason='%s'", blocked, blocked_hash, reason)
                 blocked = tidyup.domain(blocked)
                 reason  = tidyup.reason(reason) if reason is not None and reason != "" else None
                 logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
@@ -248,16 +249,13 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                 if blocked == "":
                     logger.warning("blocked is empty, domain='%s'", domain)
                     continue
-                elif blacklist.is_blacklisted(blocked):
-                    logger.debug("blocked='%s' is blacklisted - SKIPPED!", blocked)
-                    continue
                 elif blocked.count("*") > 0:
                     # Doing the hash search for instance names as well to tidy up DB
                     row = instances.deobscure("*", blocked, blocked_hash)
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning(f"Cannot deobsfucate blocked='{blocked}',blocked_hash='{blocked_hash}' - SKIPPED!")
+                        logger.warning("Cannot deobsfucate blocked='%s',blocked_hash='%s' - SKIPPED!", blocked, blocked_hash)
                         continue
 
                     logger.debug("Updating domain: row[0]='%s'", row[0])
@@ -270,7 +268,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning(f"Cannot deobsfucate blocked='{blocked}',blocked_hash='{blocked_hash}' - SKIPPED!")
+                        logger.warning("Cannot deobsfucate blocked='%s',blocked_hash='%s' - SKIPPED!", blocked, blocked_hash)
                         continue
 
                     logger.debug("Updating domain: row[0]='%s'", row[0])
@@ -278,24 +276,27 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                     origin       = row[1]
                     nodeinfo_url = row[2]
 
-                logger.debug("Looking up instance by domain:", blocked)
+                logger.debug("Looking up instance by domain: blocked='%s'", blocked)
                 if not utils.is_domain_wanted(blocked):
                     logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                     continue
+                elif blacklist.is_blacklisted(blocked):
+                    logger.debug("blocked='%s' is blacklisted - SKIPPED!", blocked)
+                    continue
                 elif not instances.is_registered(blocked):
-                    logger.debug(f"Domain blocked='{blocked}' wasn't found, adding ..., domain='{domain}',origin='{origin}',nodeinfo_url='{nodeinfo_url}'")
+                    logger.debug(f"Domain blocked='%s' wasn't found, adding ..., domain='%s',origin='%s',nodeinfo_url='%s'", blocked, domain, origin, nodeinfo_url)
                     instances.add(blocked, domain, inspect.currentframe().f_code.co_name, nodeinfo_url)
 
-                logger.debug("Looking up instance by domain:", blocked)
+                logger.debug("Looking up instance by domain: blocked='%s'", blocked)
                 if not utils.is_domain_wanted(blocked):
                     logger.debug("blocked='%s' is not wanted - SKIPPED!", blocked)
                     continue
                 elif not instances.is_registered(blocked):
-                    logger.debug("Hash wasn't found, adding:", blocked, domain)
+                    logger.debug("Hash wasn't found, adding: blocked='%s',domain='%s'", blocked, domain)
                     instances.add(blocked, domain, inspect.currentframe().f_code.co_name, nodeinfo_url)
 
                 if not blocks.is_instance_blocked(domain, blocked, block_level):
-                    logger.debug("Blocking:", domain, blocked, block_level)
+                    logger.debug("Blocking domain='%s',blocked='%s',block_level='%s' ...", domain, blocked, block_level)
                     blocks.add_instance(domain, blocked, reason, block_level)
 
                     if block_level == "reject":
@@ -304,14 +305,14 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
                             "reason" : reason
                         })
                 else:
-                    logger.debug(f"Updating block last seen and reason for domain='{domain}',blocked='{blocked}' ...")
+                    logger.debug("Updating block last seen and reason for domain='%s',blocked='%s' ...", domain, blocked)
                     blocks.update_last_seen(domain, blocked, block_level)
                     blocks.update_reason(reason, domain, blocked, block_level)
 
         logger.debug("Invoking commit() ...")
         database.connection.commit()
     except network.exceptions as exception:
-        logger.warning(f"domain='{domain}',exception[{type(exception)}]:'{str(exception)}'")
+        logger.warning("domain='%s',exception[%s]='%s'", domain, type(exception), str(exception))
         instances.set_last_error(domain, exception)
 
     logger.debug("EXIT!")

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index b44f748a1863ab2201d03d0c1ff272d78c449560..d89e7dd80e6de40bf2e9b96b0b3a2b4de35a339f 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -43,7 +43,7 @@ def fetch_peers(domain: str) -> list:
         logger.debug("Checking CSRF for domain='%s'", domain)
         headers = csrf.determine(domain, dict())
     except network.exceptions as exception:
-        logger.warning(f"Exception '{type(exception)}' during checking CSRF (fetch_peers,{__name__}) - EXIT!")
+        logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s) - EXIT!", type(exception), __name__)
         instances.set_last_error(domain, exception)
         return peers
 
@@ -72,20 +72,20 @@ def fetch_peers(domain: str) -> list:
                                 logger.debug(f"Found host='{record[mode2]['host']}', adding ...")
                                 peers.append(record[mode2]["host"])
                             else:
-                                logger.warning(f"record from '{domain}' has no '{mode2}' or 'host' record: {record}")
+                                logger.warning("Record from domain='%s' has no mode2='%s' or 'host' record[]='%s", domain, mode2, type(record))
 
                     if len(rows) < 100:
-                        logger.debug(f"Reached end of JSON response, domain='{domain}'")
+                        logger.debug("Reached end of JSON response, domain='%s'", domain)
                         break
 
                 # Continue with next row
                 start = start + 100
             else:
-                logger.warning(f"domain='{domain}' causes error during API query: '{data['error_message']}' - SKIPPED!")
+                logger.warning("domain='%s' causes error during API query: '%s' - SKIPPED!", domain, data['error_message'])
                 break
 
-    logger.debug(f"Adding '{len(peers)}' for domain='{domain}'")
+    logger.debug("Adding %d peers for domain='%s'", len(peers), domain)
     instances.set_total_peers(domain, peers)
 
-    logger.debug(f"Returning peers[]='{type(peers)}'")
+    logger.debug("Returning peers[]='%s' - EXIT!", type(peers))
     return peers

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 28caa2376fd799ff41a3c09da4d55f9ea40c066c..bfd41f667119095ced3efd0c27fc0de716a6a98b 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -301,7 +301,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning(f"Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
+                        logger.warning("Cannot deobsfucate blocked='%s',domain='%s',origin='%s' - SKIPPED!", blocked, domain, origin)
                         continue
 
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -314,7 +314,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                     logger.debug("row[]='%s'", type(row))
                     if row is None:
-                        logger.warning(f"Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
+                        logger.warning("Cannot deobsfucate blocked='%s',domain='%s',origin='%s' - SKIPPED!", blocked, domain, origin)
                         continue
 
                     logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -370,7 +370,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning(f"Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
+                    logger.warning("Cannot deobsfucate blocked='%s',domain='%s',origin='%s' - SKIPPED!", blocked, domain, origin)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -383,7 +383,7 @@ def fetch_blocks(domain: str, origin: str, nodeinfo_url: str):
 
                 logger.debug("row[]='%s'", type(row))
                 if row is None:
-                    logger.warning(f"Cannot deobsfucate blocked='{blocked}',domain='{domain}',origin='{origin}' - SKIPPED!")
+                    logger.warning("Cannot deobsfucate blocked='%s',domain='%s',origin='%s' - SKIPPED!", blocked, domain, origin)
                     continue
 
                 logger.debug("blocked='%s' de-obscured to '%s'", blocked, row[0])
@@ -563,7 +563,7 @@ def fetch_blocks_from_about(domain: str) -> dict:
         else:
             logger.warning("header_text='%s' not found in blocklist()=%d", header_text, len(blocklist))
 
-    logger.debug("Returning blocklist for domain='%s' ...", domain)
+    logger.debug("Returning blocklist for domain='%s' - EXIT!", domain)
     return {
         "reject"        : blocklist["Suspended servers"],
         "media_removal" : blocklist["Filtered media"],

diff --git a/fba/utils.py b/fba/utils.py
index d16c197137db2d2a1f1771133a42da5119c8ffa7..2460cd514d2110f038bbdcf4284a37a72ede7593 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -68,7 +68,7 @@ def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Respon
     else:
         response = network.fetch_response(components.netloc, components.path if isinstance(components.path, str) and components.path != '' else '/', headers, timeout)
 
-    logger.debug(f"response[]='{type(response)}' - EXXIT!")
+    logger.debug(f"response[]='{type(response)}' - EXIT!")
     return response
 
 def process_domain(domain: str, blocker: str, command: str) -> bool:
@@ -155,7 +155,7 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
     logger.debug("domains()=%d - EXIT!", len(domains))
     return domains
 
-def is_domain_wanted (domain: str) -> bool:
+def is_domain_wanted(domain: str) -> bool:
     logger.debug("domain='%s' - CALLED!", domain)
 
     wanted = True