Continued:

- used domain_helper.raise_on(domain) instead

diff --git a/fba/models/error_log.py b/fba/models/error_log.py
index bfa27f2cbe9ec2c1e9e2ec9990558208d27e06af..47c9eca4debd6a1864877bb312d2574e5464fd8b 100644 (file)
--- a/fba/models/error_log.py
+++ b/fba/models/error_log.py
@@ -28,6 +28,7 @@ logger = logging.getLogger(__name__)
 def add(domain: str, error: dict):
     logger.debug("domain='%s',error[]='%s' - CALLED!", domain, type(error))
     domain_helper.raise_on(domain)
+
     if config.get("write_error_log").lower() != "true":
         logger.debug("Writing to error_log is disabled in configuruation file - EXIT!")
         return

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 5a374a5530f6705f423d41fac947bcf02e65deec..c1ca5ea0ff0102f97f8d31bf570c20a6c4805948 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -313,20 +313,9 @@ 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)
+    domain_helper.raise_on(domain)
 
-    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(".onion"):
-        raise ValueError(f"domain='{domain}' is a TOR domain, 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):
+    if not isinstance(char, str):
         raise ValueError(f"Parameter char[]='{type(char)}' is not 'str'")
     elif char == "":
         raise ValueError("Parameter 'char' is empty")