X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=fba%2Futils.py;h=8244a78a1cce162e056e235e8244ad3fcb3f5235;hb=2403b1d3ef9991545bb21d15c32376adda86d419;hp=6f12fb75a0a554a8992e3db31d5810f676d88eff;hpb=08b177296bd013b334d619a22b40753d7bf1fd68;p=fba.git diff --git a/fba/utils.py b/fba/utils.py index 6f12fb7..8244a78 100644 --- a/fba/utils.py +++ b/fba/utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2023 Free Software Foundation + # Copyright (C) 2023 Free Software Foundation # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published @@ -20,14 +20,11 @@ from urllib.parse import urlparse import bs4 import requests -import validators -from fba.helpers import blacklist -from fba.helpers import cookies +from fba.helpers import config from fba.helpers import domain as domain_helper from fba.helpers import tidyup -from fba.http import federation from fba.http import network from fba.models import instances @@ -39,7 +36,7 @@ logger = logging.getLogger(__name__) def is_primitive(var: any) -> bool: logger.debug("var[]='%s' - CALLED!", type(var)) - return type(var) in {int, str, float, bool} or var is None + return type(var) in {int, str, float, bool, None} or var is None def get_hash(domain: str) -> str: logger.debug("domain='%s' - CALLED!", domain) @@ -49,14 +46,15 @@ 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 'str'") + raise ValueError(f"Parameter url[]='{type(url)}' is not of type 'str'") elif url == "": raise ValueError("Parameter 'url' is empty") elif not isinstance(headers, dict): - raise ValueError(f"Parameter headers[]='{type(headers)}' is not 'dict'") + raise ValueError(f"Parameter headers[]='{type(headers)}' is not of type 'dict'") elif not isinstance(timeout, tuple): - raise ValueError(f"Parameter timeout[]='{type(timeout)}' is not 'tuple'") + raise ValueError(f"Parameter timeout[]='{type(timeout)}' is not of type 'tuple'") logger.debug("Parsing url='%s' ...", url) components = urlparse(url) @@ -64,93 +62,30 @@ 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 process_domain(domain: str, blocker: str, command: str) -> bool: - logger.debug("domain='%s',blocker='%s',command='%s' - CALLED!", domain, blocker, command) - domain_helper.raise_on(domain) - domain_helper.raise_on(blocker) - - if not isinstance(command, str): - raise ValueError(f"Parameter command[]='{type(command)}' is not 'str'") - elif command == "": - raise ValueError("Parameter 'command' is empty") - - logger.debug("domain='%s' - BEFORE!") - if domain.find("*") > 0: - logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker) - instances.set_has_obfuscation(blocker, True) - - # Try to de-obscure it - row = instances.deobfuscate("*", domain) - - logger.debug("row[%s]='%s'", type(row), row) - if row is None: - logger.warning("Cannot de-obfuscate domain='%s' - SKIPPED!", domain) - return False - - logger.debug("domain='%s' de-obscured to '%s'", domain, row[0]) - domain = row[0] - elif domain.find("?") > 0: - logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker) - instances.set_has_obfuscation(blocker, True) - - # Try to de-obscure it - row = instances.deobfuscate("?", domain) - - logger.debug("row[%s]='%s'", type(row), row) - if row is None: - logger.warning("Cannot de-obfuscate domain='%s' - SKIPPED!", domain) - return False - - logger.debug("domain='%s' de-obscured to '%s'", domain, row[0]) - domain = row[0] - else: - logger.debug("blocker='%s' has NO obfuscation on their block list", blocker) - instances.set_has_obfuscation(blocker, False) - - logger.debug("domain='%s' - DEOBFUSCATED!", domain) - if instances.has_pending(blocker): - logger.debug("Invoking instances.update_data(%s) ...", blocker) - instances.update_data(blocker) - - if not is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!", domain) - return False - elif instances.is_recent(domain): - logger.debug("domain='%s' has been recently checked - SKIPPED!", domain) - return False - - processed = False - try: - logger.info("Fetching instances for domain='%s',blocker='%s',command='%s' ...", domain, blocker, command) - federation.fetch_instances(domain, blocker, None, command) - processed = True - - logger.debug("Invoking cookies.clear(%s) ...", domain) - cookies.clear(domain) - except network.exceptions as exception: - logger.warning("Exception '%s' during fetching instances (fetch_oliphant) from domain='%s'", type(exception), domain) - instances.set_last_error(domain, exception) - - if instances.has_pending(domain): - logger.debug("domain='%s' has pending data updates") - instances.update_data(domain) - - logger.debug("processed='%s' - EXIT!", processed) - return processed - 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 'ResultSet'") + raise ValueError(f"Parameter tags[]='{type(tags)}' is not of type 'ResultSet'") elif not isinstance(search, str): - raise ValueError(f"Parameter search[]='{type(search)}' is not 'str'") + raise ValueError(f"Parameter search[]='{type(search)}' is not of type 'str'") elif search == "": raise ValueError("Parameter 'search' is empty") @@ -159,14 +94,23 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list: for tag in tags: logger.debug("tag[]='%s'", type(tag)) domain = tidyup.domain(tag.find(search).contents[0]) + logger.debug("domain='%s' - AFTER!", domain) - logger.debug("domain='%s'", domain) if domain == "": logger.debug("tag='%s' has no domain, trying ...", tag) domain = tidyup.domain(tag.find("em").contents[0]) + logger.debug("domain='%s' - AFTER!", domain) + + if domain == "": + logger.warning("Empty domain after checking search='%s' and tags - SKIPPED!", search) + continue + + logger.debug("domain='%s' - BEFORE!", domain) + domain = domain.encode("idna").decode("utf-8") + logger.debug("domain='%s' - AFTER!", domain) - if not is_domain_wanted(domain): - logger.debug("domain='%s' is not wanted - SKIPPED!") + if not domain_helper.is_wanted(domain): + logger.debug("domain='%s' is not wanted - SKIPPED!", domain) continue logger.debug("Appending domain='%s'", domain) @@ -175,61 +119,51 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list: logger.debug("domains()=%d - EXIT!", len(domains)) return domains -def is_domain_wanted(domain: str) -> bool: - logger.debug("domain='%s' - CALLED!", domain) +def deobfuscate(domain: str, blocker: str, domain_hash: str = None) -> str: + logger.debug("domain='%s',blocker='%s',domain_hash='%s' - CALLED!", domain, blocker, domain_hash) + domain_helper.raise_on(blocker) - wanted = True if not isinstance(domain, str): - raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'") + raise ValueError(f"Parameter domain[]='{type(domain)}' is not of type 'str'") elif domain == "": - raise ValueError("Parameter 'domain' is empty") - elif domain.lower() != domain: - wanted = False - elif not validators.domain(domain.split("/")[0]): - logger.debug("domain='%s' is not a valid domain name - settings False ...", domain) - wanted = False - elif domain.endswith(".arpa"): - logger.debug("domain='%s' is a domain for reversed IP addresses - settings False ...", domain) - wanted = False - elif domain.endswith(".tld"): - logger.debug("domain='%s' is a fake domain - settings False ...", domain) - wanted = False - elif blacklist.is_blacklisted(domain): - logger.debug("domain='%s' is blacklisted - settings False ...", domain) - wanted = False - - logger.debug("wanted='%s' - EXIT!", wanted) - return wanted - -def deobfuscate_domain(domain: str, blocker: str) -> str: - logger.debug("domain='%s',blocker='%s' - CALLED!", domain, blocker) - domain_helper.raise_on(domain) - domain_helper.raise_on(blocker) + raise ValueError("Parameter domain is empty") + 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.count("*") > 0: - logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker) + 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) + row = instances.deobfuscate("*", domain, domain_hash) logger.debug("row[]='%s'", type(row)) if row is not None: - logger.debug("domain='%s' de-obscured to '%s'", domain, row[0]) - domain = row[0] - elif domain.count("?") > 0: - logger.debug("blocker='%s' uses obfuscated domains, marking ...", blocker) + logger.debug("domain='%s' de-obscured to '%s'", domain, row["domain"]) + domain = row["domain"] + else: + logger.warning("blocker='%s' has domain='%s' that cannot be deobfuscated.", blocker, domain) + 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) + row = instances.deobfuscate("?", domain, domain_hash) logger.debug("row[]='%s'", type(row)) if row is not None: - logger.debug("domain='%s' de-obscured to '%s'", domain, row[0]) - domain = row[0] + logger.debug("domain='%s' de-obscured to '%s'", domain, row["domain"]) + domain = row["domain"] + else: + logger.warning("blocker='%s' has domain='%s' that cannot be deobfuscated.", blocker, domain) else: logger.debug("domain='%s' is not obfuscated", domain) logger.debug("domain='%s' - EXIT!", domain) return domain + +def base_url() -> str: + return f"{config.get('scheme')}://{config.get('hostname')}{config.get('base_url')}"