Continued:

- more checks against blacklist

diff --git a/fba/helpers/blocklists.py b/fba/helpers/blocklists.py
index 03af850df331f6f04bc6b9745719338f984010c0..0538cffe756b3bd16d5b3d63538aaf497d4c3bb2 100644 (file)
--- a/fba/helpers/blocklists.py
+++ b/fba/helpers/blocklists.py
@@ -16,6 +16,7 @@
 
 import logging
 
+from fba.helpers import blacklist
 from fba.helpers import domain as domain_helper
 
 logging.basicConfig(level=logging.INFO)
@@ -104,6 +105,9 @@ def has(domain: str) -> bool:
     logger.debug("domain='%s' - CALLED!")
     domain_helper.raise_on(domain)
 
+    if blacklist.is_blacklisted(domain):
+        raise ValueError(f"domain='{domain}' is blacklisted but function was invoked")
+
     # Default is not found
     found = False
     for row in oliphant_blocklists + csv_files:

diff --git a/fba/helpers/cookies.py b/fba/helpers/cookies.py
index d98df82f0c0ab1033b91e9decfa75e987b4a646a..15f4fc77f1ea08295d773fc0ccc52ac8c37a7a1f 100644 (file)
--- a/fba/helpers/cookies.py
+++ b/fba/helpers/cookies.py
@@ -16,6 +16,7 @@
 
 import logging
 
+from fba.helpers import blacklist
 from fba.helpers import domain as domain_helper
 
 logging.basicConfig(level=logging.INFO)
@@ -27,7 +28,10 @@ _cookies = {}
 def store(domain: str, cookies: dict):
     logger.debug("domain='%s',cookies()=%d - CALLED!", domain, len(cookies))
     domain_helper.raise_on(domain)
-    if not isinstance(cookies, dict):
+
+    if blacklist.is_blacklisted(domain):
+        raise ValueError(f"domain='{domain}' is blacklisted but function was invoked")
+    elif not isinstance(cookies, dict):
         raise ValueError(f"Parameter cookies[]='{type(cookies)}' is not of type 'dict'")
 
     _cookies[domain] = cookies
@@ -38,6 +42,9 @@ def get_all(domain: str) -> dict:
     logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
+    if blacklist.is_blacklisted(domain):
+        raise ValueError(f"domain='{domain}' is blacklisted but function was invoked")
+
     if domain not in _cookies:
         return dict()
 
@@ -48,6 +55,9 @@ def has(domain: str) -> bool:
     logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
+    if blacklist.is_blacklisted(domain):
+        raise ValueError(f"domain='{domain}' is blacklisted but function was invoked")
+
     has_cookies = domain in _cookies
 
     logger.debug("has_cookies='%s' - EXIT!", has_cookies)
@@ -57,6 +67,9 @@ def clear(domain: str):
     logger.debug("domain='%s' - CALLED!", domain)
     domain_helper.raise_on(domain)
 
+    if blacklist.is_blacklisted(domain):
+        raise ValueError(f"domain='{domain}' is blacklisted but function was invoked")
+
     if has(domain):
         logger.debug("Removing cookies for domain='%s' ...", domain)
         del _cookies[domain]

diff --git a/fba/models/blocks.py b/fba/models/blocks.py
index 70e6eb3f83f12133b0a9b421b40814fe1d75e53e..904286d19b78bfd997104eb07bce061037b638ef 100644 (file)
--- a/fba/models/blocks.py
+++ b/fba/models/blocks.py
@@ -40,6 +40,10 @@ def update_reason(reason: str, blocker: str, blocked: str, block_level: str):
         raise ValueError("Parameter 'block_level' is empty")
     elif block_level in ["accept", "suspend", "silence", "nsfw", "quarantined_instances"]:
         raise ValueError(f"block_level='{block_level}' is not wanted.")
+    elif blacklist.is_blacklisted(blocker):
+        raise Exception(f"blocker='{blocker}' is blacklisted but function invoked")
+    elif blacklist.is_blacklisted(blocked):
+        raise Exception(f"blocked='{blocked}' is blacklisted but function invoked")
     elif not is_instance_blocked(blocker, blocked, block_level):
         raise Exception(f"blocker='{blocker}',blocked='{blocked}',block_level='{block_level}' is not registered but function is invoked")