Continued:

[fba.git] / fba / utils.py

diff --git a/fba/utils.py b/fba/utils.py
index 44c831014cbafd3db123376cebba73a536e70f49..6652c19261e7747d268f5213d3d220e207f1af14 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -46,6 +46,7 @@ def get_hash(domain: str) -> str:
 
 def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Response:
     logger.debug("url='%s',headers()=%d,timeout(%d)='%s' - CALLED!", url, len(headers), len(timeout), timeout)
+
     if not isinstance(url, str):
         raise ValueError(f"Parameter url[]='{type(url)}' is not of type 'str'")
     elif url == "":
@@ -61,15 +62,16 @@ def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Respon
     # Invoke other function, avoid trailing ?
     logger.debug("components[%s]='%s'", type(components), components)
     if components.query != "":
-        response = network.fetch_response(components.netloc, f"{components.path}?{components.query}", headers, timeout)
+        response = network.fetch_response(components.netloc.split(":")[0], f"{components.path}?{components.query}", headers, timeout)
     else:
-        response = network.fetch_response(components.netloc, components.path if isinstance(components.path, str) and components.path != '' else '/', headers, timeout)
+        response = network.fetch_response(components.netloc.split(":")[0], components.path if isinstance(components.path, str) and components.path != '' else '/', headers, timeout)
 
     logger.debug("response[]='%s' - EXIT!", type(response))
     return response
 
 def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
     logger.debug("tags[%s]()=%d,search='%s' - CALLED!", type(tags), len(tags), search)
+
     if not isinstance(tags, bs4.element.ResultSet):
         raise ValueError(f"Parameter tags[]='{type(tags)}' is not of type 'ResultSet'")
     elif not isinstance(search, str):
@@ -118,8 +120,12 @@ def deobfuscate(domain: str, blocker: str, domain_hash: str = None) -> str:
     elif not isinstance(domain_hash, str) and domain_hash is not None:
         raise ValueError(f"Parameter domain_hash[]='{type(domain_hash)}' is not of type 'str'")
 
+    logger.debug("Setting has_obfuscation=False for blocker='%s' ...", blocker)
+    instances.set_has_obfuscation(blocker, False)
+
     if domain.find("*") >= 0:
         logger.debug("blocker='%s' uses obfuscated domains", blocker)
+        instances.set_has_obfuscation(blocker, True)
 
         # Obscured domain name with no hash
         row = instances.deobfuscate("*", domain, domain_hash)
@@ -130,9 +136,9 @@ def deobfuscate(domain: str, blocker: str, domain_hash: str = None) -> str:
             domain = row["domain"]
         else:
             logger.warning("blocker='%s' has domain='%s' that cannot be deobfuscated.", blocker, domain)
-            instances.set_has_obfuscation(blocker, True)
     elif domain.find("?") >= 0:
         logger.debug("blocker='%s' uses obfuscated domains", blocker)
+        instances.set_has_obfuscation(blocker, True)
 
         # Obscured domain name with no hash
         row = instances.deobfuscate("?", domain, domain_hash)
@@ -143,7 +149,6 @@ def deobfuscate(domain: str, blocker: str, domain_hash: str = None) -> str:
             domain = row["domain"]
         else:
             logger.warning("blocker='%s' has domain='%s' that cannot be deobfuscated.", blocker, domain)
-            instances.set_has_obfuscation(blocker, True)
     else:
         logger.debug("domain='%s' is not obfuscated", domain)