Continued:

- only check for domain part, some instances may have been installed in a sub
  path

diff --git a/api.py b/api.py
index 87f7145cfeb7897601a8415d5dffa376f4851217..052b3836e49b06e15c0ad677705f007b9b3d459b 100644 (file)
--- a/api.py
+++ b/api.py
@@ -93,7 +93,7 @@ def api_blocked(domain: str = None, reason: str = None, reverse: str = None):
 
     if domain is not None:
         domain = tidyup.domain(domain)
-        if not validators.domain(domain):
+        if not validators.domain(domain.split("/")[0]):
             raise HTTPException(status_code=500, detail="Invalid domain")
 
         wildchar = "*." + ".".join(domain.split(".")[-domain.count("."):])
@@ -218,7 +218,7 @@ def top(request: Request, domain: str = None, reason: str = None, reverse: str =
 
     if domain is not None:
         domain = tidyup.domain(domain)
-        if not validators.domain(domain):
+        if not validators.domain(domain.split("/")[0]):
             raise HTTPException(status_code=500, detail="Invalid domain")
 
         response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/index.json?domain={domain}")

diff --git a/fba/commands.py b/fba/commands.py
index e51de628fa3dd353b8ed01fe2e25df6b308c1e7f..4daf53465b7d4fba8c1dd69ec3263335fa0bdc4e 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -344,7 +344,7 @@ def fetch_observer(args: argparse.Namespace):
             domain = item.decode_contents()
 
             # DEBUG: print(f"DEBUG: domain='{domain}'")
-            if not validators.domain(domain):
+            if not validators.domain(domain.split("/")[0]):
                 print(f"WARNING: domain='{domain}' is not a valid domain - SKIPPED!")
                 continue
             elif blacklist.is_blacklisted(domain):

diff --git a/fba/fba.py b/fba/fba.py
index 23e2de38fbccad187007becd7120dcce8a79f064..8e3c0c06cd4c4dbd478f5126c0a7469fb50788db 100644 (file)
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -108,7 +108,7 @@ def process_domain(domain: str, blocker: str, command: str) -> bool:
         # DEBUG: print(f"DEBUG: domain='{domain}' de-obscured to '{row[0]}'")
         domain = row[0]
 
-    if not validators.domain(domain):
+    if not validators.domain(domain.split("/")[0]):
         print(f"WARNING: domain='{domain}' is not a valid domain - SKIPPED!")
         return False
     elif domain.endswith(".arpa"):

diff --git a/fba/federation.py b/fba/federation.py
index 2ebd402d258d616873b72860f5d8bb16d3eb3c30..6d3247f58b6e1a58af893048d9d444055b5408bf 100644 (file)
--- a/fba/federation.py
+++ b/fba/federation.py
@@ -50,7 +50,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -148,7 +148,7 @@ def fetch_peers(domain: str, software: str) -> list:
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -228,7 +228,7 @@ def fetch_nodeinfo(domain: str, path: str = None) -> dict:
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -304,7 +304,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -381,7 +381,7 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -582,7 +582,7 @@ def find_domains(tag: bs4.element.Tag) -> list:
                 "reason": reason,
             })
             continue
-        elif not validators.domain(domain):
+        elif not validators.domain(domain.split("/")[0]):
             print(f"WARNING: domain='{domain}' is not a valid domain - SKIPPED!")
             continue
 

diff --git a/fba/network.py b/fba/network.py
index ae98476a2add1a2306b845c9dda653dcc107a694..3ebba9d579d2faf46407a38306a538f75d8aa5d1 100644 (file)
--- a/fba/network.py
+++ b/fba/network.py
@@ -54,7 +54,7 @@ def post_json_api(domain: str, path: str, data: str = "", headers: dict = {}) ->
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -143,7 +143,7 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")
@@ -244,7 +244,7 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> req
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
-    elif not validators.domain(domain):
+    elif not validators.domain(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!")