Continued:

- use validators.hostname() as these are host names

diff --git a/fba/commands.py b/fba/commands.py
index 9d37cb757a392f51eef5d46a9b61a81035fb377a..9dea3f88a193b8e90b05b96cf401443c06e13426 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -64,7 +64,7 @@ logger = logging.getLogger(__name__)
 def check_instance(args: argparse.Namespace) -> int:
     logger.debug("args.domain='%s' - CALLED!", args.domain)
     status = 0
-    if not validators.domain(args.domain):
+    if not validators.hostname(args.domain):
         logger.warning("args.domain='%s' is not valid", args.domain)
         status = 100
     elif blacklist.is_blacklisted(args.domain):
@@ -266,7 +266,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
     logger.debug("args[]='%s' - CALLED!", type(args))
     if args.domain is not None and args.domain != "":
         logger.debug("args.domain='%s' - checking ...", args.domain)
-        if not validators.domain(args.domain):
+        if not validators.hostname(args.domain):
             logger.warning("args.domain='%s' is not valid.", args.domain)
             return 100
         elif blacklist.is_blacklisted(args.domain):
@@ -914,7 +914,7 @@ def fetch_instances(args: argparse.Namespace) -> int:
     logger.debug("args[]='%s' - CALLED!", type(args))
 
     logger.debug("args.domain='%s' - checking ...", args.domain)
-    if not validators.domain(args.domain):
+    if not validators.hostname(args.domain):
         logger.warning("args.domain='%s' is not valid.", args.domain)
         return 100
     elif blacklist.is_blacklisted(args.domain):
@@ -1065,7 +1065,7 @@ def fetch_oliphant(args: argparse.Namespace) -> int:
                 domain = utils.deobfuscate(domain, block["blocker"])
                 logger.debug("domain='%s' - AFTER!", domain)
 
-            if not validators.domain(domain):
+            if not validators.hostname(domain):
                 logger.debug("domain='%s' is not a valid domain - SKIPPED!")
                 continue
             elif blacklist.is_blacklisted(domain):
@@ -1371,7 +1371,7 @@ def fetch_joinfediverse(args: argparse.Namespace) -> int:
                     if not isinstance(text, str):
                         logger.debug("text[]='%s' is not of type 'str' - SKIPPED!", type(text))
                         continue
-                    elif validators.domain(text.strip()):
+                    elif validators.hostname(text.strip()):
                         logger.debug("text='%s' is a domain - SKIPPED!", text.strip())
                         continue
 
@@ -1506,7 +1506,7 @@ def recheck_obfuscation(args: argparse.Namespace) -> int:
 
     if isinstance(args.domain, str) and args.domain != "" and domain_helper.is_wanted(args.domain):
         database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE has_obfuscation = 1 AND domain = ?", [args.domain])
-    elif isinstance(args.software, str) and args.software != "" and validators.domain(args.software) == args.software:
+    elif isinstance(args.software, str) and args.software != "" and validators.hostname(args.software) == args.software:
         database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE has_obfuscation = 1 AND software = ?", [args.software])
     else:
         database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE has_obfuscation = 1")

diff --git a/fba/helpers/domain.py b/fba/helpers/domain.py
index 96aa189d4ef7e9c0610a6d86a280929f5ad40b84..6804b3acd72130053d40f3aee23c48b16eaee252 100644 (file)
--- a/fba/helpers/domain.py
+++ b/fba/helpers/domain.py
@@ -35,7 +35,7 @@ def raise_on(domain: str):
         raise ValueError("Parameter 'domain' is empty")
     elif domain.lower() != domain:
         raise ValueError(f"Parameter domain='{domain}' must be all lower-case")
-    elif not validators.domain(domain.split("/")[0]):
+    elif not validators.hostname(domain.split("/")[0]):
         raise ValueError(f"domain='{domain}' is not a valid domain")
     elif domain.endswith(".arpa"):
         raise ValueError(f"domain='{domain}' is a domain for reversed IP addresses, please don't crawl them!")
@@ -75,7 +75,7 @@ def is_wanted(domain: str) -> bool:
         raise ValueError("Parameter 'domain' is empty")
     elif domain.lower() != domain:
         wanted = False
-    elif not validators.domain(domain.split("/")[0]):
+    elif not validators.hostname(domain.split("/")[0]):
         logger.debug("domain='%s' is not a valid domain name - setting False ...", domain)
         wanted = False
     elif domain.endswith(".arpa"):

diff --git a/fba/http/federation.py b/fba/http/federation.py
index c5b4cf72ab17653c3ab7b7bcc1c8aa6230e6e939..ff831e548fcd5297a7e49bda1d68dea17858c18a 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -476,7 +476,7 @@ def find_domains(tag: bs4.element.Tag) -> list:
                 "reason": reason,
             })
             continue
-        elif not validators.domain(domain.split("/")[0]):
+        elif not validators.hostname(domain.split("/")[0]):
             logger.warning("domain='%s' is not a valid domain - SKIPPED!", domain)
             continue
 

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 1bd2884728dd5af44f7770833a7a43ccd3cd2f8a..5a801b0c247bb66383c2e7796a9425513e96ec3a 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -174,7 +174,7 @@ def add(domain: str, origin: str, command: str, path: str = None, software: str
         raise ValueError(f"software[]='{type(software)}' is not of type 'str'")
     elif software == "":
         raise ValueError("Parameter 'software' is empty")
-    elif origin is not None and not validators.domain(origin.split("/")[0]):
+    elif origin is not None and not validators.hostname(origin.split("/")[0]):
         raise ValueError(f"Bad origin name='{origin}'")
     elif blacklist.is_blacklisted(domain):
         raise Exception(f"domain='{domain}' is blacklisted, but function invoked")