Continued:

- added missing type 'bool'
- improved/added debug lines

diff --git a/fba/http/federation.py b/fba/http/federation.py
index aa05e37367c87bb6986274767c66c331185d7156..b4b629a4a84a039df34d5727522b07dfde22dae5 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -654,7 +654,7 @@ def fetch_blocks(domain: str) -> list:
                 elif block["severity"] in ["accept", "accepted"]:
                     logger.debug("block[domain]='%s' has unwanted severity level '%s' - SKIPPED!", block["domain"], block["severity"])
                     continue
-                elif "digest" in block and not validators.hashes.sha256(block["digest"]):
+                elif "digest" in block and not block["digest"] is None and not validators.hashes.sha256(block["digest"]):
                     logger.warning("block[domain]='%s' has invalid block[digest]='%s' - SKIPPED!", block["domain"], block["digest"])
                     continue
 

diff --git a/fba/models/instances.py b/fba/models/instances.py
index d3cde89230c5135de8822f6fcee18e6274de367f..38d28cb122d0c4a5ad4031f7821fab5e38c3cfbc 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -311,7 +311,7 @@ def set_success(domain: str) -> None:
 
     logger.debug("EXIT!")
 
-def is_registered(domain: str, skip_raise = False) -> bool:
+def is_registered(domain: str, skip_raise: bool = False) -> bool:
     logger.debug("domain='%s',skip_raise='%s' - CALLED!", domain, skip_raise)
     domain_helper.raise_on(domain)
 
@@ -360,12 +360,14 @@ def is_recent(domain: str, column: str = "last_instance_fetch") -> bool:
 
     # Fetch row
     row = database.cursor.fetchone()
+    logger.debug("row[%s]='%s'", type(row), row)
 
     fetched = float(row[column]) if row[column] is not None else 0.0
+    logger.debug("fetched[%s]=%f", type(fetched), fetched)
 
     diff = (time.time() - fetched)
 
-    logger.debug("fetched[%s]='%s',key='%s',diff=%f", type(fetched), fetched, key, diff)
+    logger.debug("fetched[%s]=%f,key='%s',diff=%f", type(fetched), fetched, key, diff)
     recently = bool(diff < config.get(key))
 
     logger.debug("recently='%s' - EXIT!", recently)
@@ -374,12 +376,14 @@ def is_recent(domain: str, column: str = "last_instance_fetch") -> bool:
 def deobfuscate(char: str, domain: str, blocked_hash: str = None) -> tuple:
     logger.debug("char='%s',domain='%s',blocked_hash='%s' - CALLED!", char, domain, blocked_hash)
 
-    if not isinstance(domain, str):
-        raise ValueError(f"Parameter domain[]='{type(domain)}'")
-    elif not isinstance(char, str):
+    if not isinstance(char, str):
         raise ValueError(f"Parameter char[]='{type(char)}' is not of type 'str'")
     elif char == "":
         raise ValueError("Parameter 'char' is empty")
+    elif not isinstance(domain, str):
+        raise ValueError(f"Parameter domain[]='{type(domain)}'")
+    elif domain == "":
+        raise ValueError("Parameter 'domain' is empty")
     elif not char in domain:
         raise ValueError(f"char='{char}' not found in domain='{domain}' but function invoked")
     elif not isinstance(blocked_hash, str) and blocked_hash is not None:
@@ -397,8 +401,8 @@ def deobfuscate(char: str, domain: str, blocked_hash: str = None) -> tuple:
         )
 
         row = database.cursor.fetchone()
-        logger.debug("row[]='%s' - After quering database.", type(row))
 
+        logger.debug("row[]='%s' - After quering database.", type(row))
         if row is None:
             logger.debug("blocked_hash='%s' not found, trying domain='%s' ...", blocked_hash, domain)
             return deobfuscate(char, domain)

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index 2fd53b72a594f0547d9061748ca2699e788a6a0e..9329fe1718680d1714a52f042c5e210344dd112a 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -81,13 +81,13 @@ def fetch_blocks(domain: str) -> list:
 
     logger.debug("Found rows()=%d", len(rows))
     for line in rows:
-        logger.debug("line='%s'", line)
+        logger.debug("line[%s]='%s'", type(line), line)
         blocked = line.find_all("td")[0].text
         reason  = line.find_all("td")[1].text
-        logger.debug("blocked='%s',reason='%s' - BEFORE!", blocked, reason)
 
+        logger.debug("blocked='%s',reason='%s' - BEFORE!", blocked, reason)
         blocked = tidyup.domain(blocked) if blocked != "" else None
-        reason  = tidyup.reason(reason) if reason != "" else None
+        reason  = tidyup.reason(reason)  if reason  != "" else None
         logger.debug("blocked='%s',reason='%s' - AFTER!", blocked, reason)
 
         if blocked in [None, ""]:

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index 9fcfbfe6a90463d6668433e822d8c65c8721c836..35ba0c3a4fe7df4f4199bfcef8f85385a768d543 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -97,7 +97,7 @@ def fetch_peers(domain: str, origin: str) -> list:
         data = network.get_json_api(
             domain,
             "/api/v3/site",
-            headers,
+            headers=headers,
             timeout=config.timeout
         )
 
@@ -268,7 +268,7 @@ def fetch_instances(domain: str, origin: str) -> list:
                 logger.debug("Checking %d containers ...", len(containers))
                 for header in containers:
                     logger.debug("header[%s]='%s'", type(header), header)
-                    table = header.find_next(["ul","table"])
+                    table = header.find_next(["ul", "table"])
 
                     logger.debug("table[]='%s'", type(table))
                     if table is None:

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index dfa79beab356d2e6fe6e4ad0e1429ea152aec590..d748db43af580e61df60caea5485070f6b3fa4ab 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -32,6 +32,7 @@ from fba.models import instances
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 # Language mapping X -> English
 _language_mapping = {
@@ -182,6 +183,7 @@ def fetch_blocks(domain: str) -> list:
     if len(rows) > 0:
         logger.debug("Checking %d entries from domain='%s' ...", len(rows), domain)
         for block_level in rows:
+            logger.debug("block_level='%s'", block_level)
             blocklists = rows[block_level]
 
             logger.debug("block_level='%s',blocklists()=%d", block_level, len(blocklists))

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index dcaf1d5b636aacb45c6a5bbbba54486f60e3b378..a8bda4a96635869aaac871de210639ea7bd6a743 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -30,6 +30,7 @@ from fba.models import instances
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def fetch_peers(domain: str) -> list:
     logger.debug("domain='%s' - CALLED!", domain)
@@ -94,9 +95,9 @@ def fetch_peers(domain: str) -> list:
         if len(rows) == 0:
             logger.debug("Returned zero bytes, domain='%s' - BREAK!", domain)
             break
-        elif len(rows) != config.get("misskey_limit"):
-            logger.debug("Fetched %d row(s) but expected: %d", len(rows), config.get('misskey_limit'))
-            offset = offset + (config.get("misskey_limit") - len(rows))
+        elif len(rows) != step:
+            logger.debug("Fetched %d row(s) but expected: %d", len(rows), step)
+            offset = offset + (step - len(rows))
         else:
             logger.debug("Raising offset by step=%d", step)
             offset = offset + step
@@ -197,9 +198,9 @@ def fetch_blocks(domain: str) -> list:
             if len(rows) == 0:
                 logger.debug("Returned zero bytes, domain='%s' - BREAK!", domain)
                 break
-            elif len(rows) != config.get("misskey_limit"):
-                logger.debug("Fetched %d row(s) but expected: %d", len(rows), config.get('misskey_limit'))
-                offset = offset + (config.get("misskey_limit") - len(rows))
+            elif len(rows) != step:
+                logger.debug("Fetched %d row(s) but expected: %d", len(rows), step)
+                offset = offset + (step - len(rows))
             else:
                 logger.debug("Raising offset by step=%d", step)
                 offset = offset + step
@@ -285,9 +286,9 @@ def fetch_blocks(domain: str) -> list:
             if len(rows) == 0:
                 logger.debug("Returned zero bytes, domain='%s' - BREAK!", domain)
                 break
-            elif len(rows) != config.get("misskey_limit"):
-                logger.debug("Fetched %d row(s) but expected: %d'", len(rows), config.get('misskey_limit'))
-                offset = offset + (config.get("misskey_limit") - len(rows))
+            elif len(rows) != step:
+                logger.debug("Fetched %d row(s) but expected: %d'", len(rows), step)
+                offset = offset + (step - len(rows))
             else:
                 logger.debug("Raising offset by step=%d", step)
                 offset = offset + step

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index 4b5baf0591962bf70d49a820fbb3ac05f0f44731..c0d88e48616148b33cc09a02f37bbde10935ffb9 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -26,6 +26,7 @@ from fba.models import instances
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 def fetch_peers(domain: str) -> list:
     logger.debug("domain='%s' - CALLED!", domain)

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 1abb75136617baa0c24f5c3a191650544e37d98a..8abb90df045ece7e8fd15b9dbd1d2d46e3660005 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -35,6 +35,7 @@ from fba.models import instances
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+#logger.setLevel(logging.DEBUG)
 
 # Language mapping X -> English
 language_mapping = {