Continued:

- renamed $DOMAINS to $DOMAIN_LIST (Bash script)
- need to exclude None as possible value for parameter 'path'
- added another parked domain

diff --git a/fba/helpers/blacklist.py b/fba/helpers/blacklist.py
index 019a0709a8b9b8f41175a046f64b91aba80ea9fc..6d0c6ff2da4a947a13a294b8cc9ef5484fa428e6 100644 (file)
--- a/fba/helpers/blacklist.py
+++ b/fba/helpers/blacklist.py
@@ -54,6 +54,7 @@ _blacklist = {
     "hexbear.net"         : "Is a Lemmy instance with malicious JavaScript code (shell commands)",
     "mastodon.n41.lat"    : "Somehow this instance repeatedly causes an OOM here",
     "fb.me"               : "Facebook websites are never Fediverse instances",
+    "osl.academy"         : "Parked domain, no fediverse instance",
     "icolectiva.org"      : "Parked domain, no fediverse instance",
     "blombus.com"         : "Parked domain, no fediverse instance",
     "eliotberriot.com"    : "Parked domain, no fediverse instance",

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 0523938e8fe8f30c96866f894fa7bc12d43ea633..a821d2350ee09593e2811044262300a174e2cf35 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -275,7 +275,7 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
     elif not path.startswith("/"):
-        raise ValueError("path='{path}' does not start with / but should")
+        raise ValueError(f"path='{path}' does not start with / but should")
 
     software = None
 

diff --git a/fba/http/network.py b/fba/http/network.py
index 26fa12667263e8c1e7047b1ca3beec457363450f..1e694d061d9c62a3170212f9b71a88366b1cef9d 100644 (file)
--- a/fba/http/network.py
+++ b/fba/http/network.py
@@ -66,7 +66,7 @@ def post_json_api(domain: str, path: str, data: str = "", headers: dict = dict()
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
     elif not path.startswith("/"):
-        raise ValueError("path='{path}' does not start with / but should")
+        raise ValueError(f"path='{path}' does not start with / but should")
     elif not isinstance(data, str):
         raise ValueError(f"data[]='{type(data)}' is not of type 'str'")
     elif not isinstance(headers, dict):
@@ -163,7 +163,7 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
     elif not path.startswith("/"):
-        raise ValueError("path='{path}' does not start with / but should")
+        raise ValueError(f"path='{path}' does not start with / but should")
     elif not isinstance(headers, dict):
         raise ValueError(f"headers[]='{type(headers)}' is not of type 'list'")
     elif not isinstance(timeout, tuple):
@@ -259,7 +259,7 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: tuple, allow_
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
     elif not path.startswith("/"):
-        raise ValueError("path='{path}' does not start with / but should")
+        raise ValueError(f"path='{path}' does not start with / but should")
     elif not isinstance(headers, dict):
         raise ValueError(f"headers[]='{type(headers)}' is not of type 'dict'")
     elif not isinstance(timeout, tuple):

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 91af96946d4a6cc9c64bf6c31db72996b6828020..3195274192f7bd38d22d0c02b28327ce48d6d7de 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -178,8 +178,8 @@ def add(domain: str, origin: str, command: str, path: str = None, software: str
         raise ValueError(f"path[]='{type(path)}' is not of type 'str'")
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
-    elif not path.startswith("/"):
-        raise ValueError("path='{path}' does not start with / but should")
+    elif path is not None and not path.startswith("/"):
+        raise ValueError(f"path='{path}' does not start with / but should")
     elif not isinstance(software, str) and software is not None:
         raise ValueError(f"software[]='{type(software)}' is not of type 'str'")
     elif software == "":

diff --git a/nodeinfo.sh b/nodeinfo.sh
index 3ec3862fc7da60881e5a3f29e36ddb27b2f0e79f..f286f0577f9ffd451df797e4355336626da4a722 100755 (executable)
--- a/nodeinfo.sh
+++ b/nodeinfo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MODE=""
-DOMAINS=""
+DOMAIN_LIST=""
 SOFTWARE_LIST=""
 
 if [ "$1" = "--help" ]
@@ -10,15 +10,15 @@ then
        exit 255
 elif [ -n "$1" -a -f "$1" ]
 then
-       DOMAINS=$(cat "$1")
+       DOMAIN_LIST=$(cat "$1")
        MODE="file"
 elif [ "$1" = "--nodeinfo" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
        MODE="nodeinfo"
 elif [ "$1" = "--timeout" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE last_error_details LIKE '%Timeout%' ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE last_error_details LIKE '%Timeout%' ORDER BY last_updated ASC;")
        MODE="timeout"
 elif [ "$1" = "--software" -a -f "software.txt" ]
 then
@@ -26,25 +26,25 @@ then
        MODE="software"
 elif [ "$1" = "--generator" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode='GENERATOR' ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode='GENERATOR' ORDER BY last_updated ASC;")
        MODE="generator"
 elif [ "$1" = "--same" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE domain=software ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE domain=software ORDER BY last_updated ASC;")
        MODE="same"
 else
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
 fi
 
-if [ -z "${DOMAINS}" -a -z "${SOFTWARE_LIST}" ]
+if [ -z "${DOMAIN_LIST}" -a -z "${SOFTWARE_LIST}" ]
 then
        echo "$0: No domains or software found! MODE='${MODE}'"
        exit 255
 fi
 
-if [ -n "${DOMAINS}" ]
+if [ -n "${DOMAIN_LIST}" ]
 then
-       for DOMAIN in ${DOMAINS};
+       for DOMAIN in ${DOMAIN_LIST};
        do
                echo "$0: DOMAIN='${DOMAIN}'"
                if [ -n "$1" -a -z "${MODE}" ]