Continued:

[fba.git] / fba.py

diff --git a/fba.py b/fba.py
index 37e7384ae8c9220d1a19a0204d57f0c52c3adf34..0b58c53b3fb3504c2c78c0c1933f4416aec8d32f 100644 (file)
--- a/fba.py
+++ b/fba.py
@@ -191,11 +191,11 @@ def is_cache_key_set(key: str, sub: str) -> bool:
 ##### Other functions #####
 
 def is_primitive(var: any) -> bool:
-    #print(f"DEBUG: var[]='{type(var)}' - CALLED!")
+    # NOISY-DEBUG: print(f"DEBUG: var[]='{type(var)}' - CALLED!")
     return type(var) in {int, str, float, bool} or var == None
 
 def set_instance_data(key: str, domain: str, value: any):
-    #print(f"DEBUG: key='{key}',domain='{domain}',value[]='{type(value)}' - CALLED!")
+    # 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 == "":
@@ -438,12 +438,12 @@ def update_instance_data(domain: str):
         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 = "UPDATE instances SET" + sql_string + " last_updated = TIME() WHERE domain = ? LIMIT 1"
-    # DEBUG: print("DEBUG: sql:", sql)
+    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)
-        cursor.execute(sql, fields)
+        # DEBUG: print("DEBUG: Executing SQL:", sql_string)
+        cursor.execute(sql_string, fields)
         # DEBUG: print(f"DEBUG: Success! (rowcount={cursor.rowcount })")
 
         if cursor.rowcount == 0:
@@ -461,7 +461,7 @@ def update_instance_data(domain: str):
                 pass
 
     except BaseException as e:
-        print(f"ERROR: failed SQL query: domain='{domain}',sql='{sql}',exception[{type(e)}]:'{str(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!")
@@ -1039,6 +1039,15 @@ def determine_software(domain: str, path: str = None) -> str:
     return software
 
 def update_block_reason(reason: str, blocker: str, blocked: str, block_level: str):
+    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(
@@ -1054,10 +1063,11 @@ def update_block_reason(reason: str, blocker: str, blocked: str, block_level: st
 
         # DEBUG: print(f"DEBUG: cursor.rowcount={cursor.rowcount}")
         if cursor.rowcount == 0:
-            print("WARNING: Did not update any rows:", domain)
+            print("WARNING: Did not update any rows:", blocker, blocked)
+            return
 
     except BaseException as e:
-        print(f"ERROR: failed SQL query: reason='{reason}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',sql='{sql}',exception[{type(e)}]:'{str(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!")
@@ -1077,6 +1087,7 @@ def update_last_seen(blocker: str, blocked: str, block_level: str):
 
         if cursor.rowcount == 0:
             print("WARNING: Did not update any rows:", domain)
+            return
 
     except BaseException as e:
         print(f"ERROR: failed SQL query: last_seen='{last_seen}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
@@ -1098,8 +1109,12 @@ def block_instance(blocker: str, blocked: str, reason: str, block_level: str):
         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("INFO: New block:", blocker, blocked, reason, block_level, first_seen, last_seen)
+    print("INFO: New block:", blocker, blocked, reason, block_level)
     try:
         cursor.execute(
             "INSERT INTO blocks (blocker, blocked, reason, block_level, first_seen, last_seen) VALUES(?, ?, ?, ?, ?, ?)",
@@ -1112,7 +1127,6 @@ def block_instance(blocker: str, blocked: str, reason: str, block_level: str):
                  time.time()
              ),
         )
-
     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)
@@ -1125,9 +1139,9 @@ def is_instance_registered(domain: str) -> bool:
     elif domain == "":
         raise ValueError(f"Parameter 'domain' cannot be empty")
 
-    # NOISY-DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
+    # NOISY-DEBUG: # DEBUG: print(f"DEBUG: domain='{domain}' - CALLED!")
     if not is_cache_initialized("is_registered"):
-        # NOISY-DEBUG: print(f"DEBUG: Cache for 'is_registered' not initialized, fetching all rows ...")
+        # NOISY-DEBUG: # DEBUG: print(f"DEBUG: Cache for 'is_registered' not initialized, fetching all rows ...")
         try:
             cursor.execute("SELECT domain FROM instances")
 
@@ -1140,7 +1154,7 @@ def is_instance_registered(domain: str) -> bool:
     # Is cache found?
     registered = is_cache_key_set("is_registered", domain)
 
-    # NOISY-DEBUG: print(f"DEBUG: registered='{registered}' - EXIT!")
+    # NOISY-DEBUG: # DEBUG: print(f"DEBUG: registered='{registered}' - EXIT!")
     return registered
 
 def add_instance(domain: str, origin: str, originator: str, path: str = None):
@@ -1154,13 +1168,14 @@ def add_instance(domain: str, origin: str, originator: str, path: str = None):
         raise ValueError(f"originator[]={type(originator)} is not 'str'")
     elif originator == "":
         raise ValueError(f"originator cannot be empty")
-
-    # DEBUG: print("DEBUG: domain,origin,originator,path:", domain, origin, originator, path)
-    if not validators.domain(domain.split("/")[0]):
+    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)
 
@@ -1252,7 +1267,7 @@ def get_mastodon_blocks(domain: str) -> dict:
 
     try:
         doc = bs4.BeautifulSoup(
-            reqto.get(f"https://{domain}/about/more", headers=headers, timeout=(config["connection_timeout"], config["read_timeout"])).text,
+            reqto.get(f"https://{domain}/about", headers=headers, timeout=(config["connection_timeout"], config["read_timeout"])).text,
             "html.parser",
         )
     except BaseException as e: