Bootstrap sys.path in root proxy files and add PYTHONPATH to CI workflow

.gitea/workflows/ci.yml

@@ -16,6 +16,8 @@ jobs:
     name: Run Component Tests & Pipeline Verification
     if: "!startsWith(github.ref, 'refs/tags/')"
     runs-on: logar
+    env:
+      PYTHONPATH: .
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3

src/Linux_Client.py

@@ -1,3 +1,11 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.clients.Linux_Client import *
+
 if __name__ == '__main__':
     main()

src/Server.py

@@ -1,3 +1,11 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.Server import *
+
 if __name__ == '__main__':
     main()

src/Win_Client.py

@@ -1,3 +1,11 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.clients.Win_Client import *
+
 if __name__ == '__main__':
     main()

src/__init__.py

@@ -6,6 +6,13 @@ Modular package namespace exposing:
   - common: Versioning and shared utilities
 """
 
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src import hub
 from src import clients
 from src import common

src/auth_manager.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.auth_manager import *

src/client_transport.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.clients.client_transport import *

src/client_updater.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.clients.client_updater import *

src/hub/Server.py

@@ -448,6 +448,16 @@ def load_or_init_config(config_path: str = CONFIG_FILE_NAME) -> Dict[str, Any]:
             config["cache_mode"] = "direct"
         if "encrypt_at_rest" not in config:
             config["encrypt_at_rest"] = False
+        if "auth_token" not in config:
+            config["auth_token"] = secrets.token_hex(24)
+        if "enrollment_secret" not in config:
+            config["enrollment_secret"] = secrets.token_hex(24)
+        if "server_fingerprint" not in config and "public_key" in config:
+            try:
+                pub, _ = pgpy.PGPKey.from_blob(config["public_key"])
+                config["server_fingerprint"] = str(pub.fingerprint)
+            except Exception:
+                config["server_fingerprint"] = ""
 
         config["db_path"] = resolve_writable_path(config["db_path"], "LOGAR-Server", DEFAULT_DB_FILE)
         config["cert_dir"] = resolve_writable_path(config["cert_dir"], "LOGAR-Server", "certs")
@@ -592,11 +602,11 @@ def create_client_config(
         "server_port": server_port,
         "hermes_host": effective_hermes_host,
         "hermes_port": hermes_port or server_conf.get("hermes_port", 8443),
-        "enrollment_secret": server_conf.get("enrollment_secret"),
+        "enrollment_secret": server_conf.get("enrollment_secret", ""),
         "cert_dir": "certs",
-        "server_fingerprint": server_conf["server_fingerprint"],
+        "server_fingerprint": server_conf.get("server_fingerprint", ""),
-        "server_public_key": server_conf["public_key"],
+        "server_public_key": server_conf.get("public_key", ""),
-        "auth_token": server_conf["auth_token"]
+        "auth_token": server_conf.get("auth_token", "")
     }
 
     out_dir = os.path.dirname(os.path.abspath(output_path))

src/ingest_queue.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.ingest_queue import *

src/license_manager.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.license_manager import *

src/log_collector.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.clients.log_collector import *

src/pki_manager.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.pki_manager import *

src/server_enrollment.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.server_enrollment import *

src/server_models.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.server_models import *

src/storage_engine.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.storage_engine import *

src/update_manager.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.update_manager import *

src/version.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.common.version import *

src/web_ui.py

@@ -1 +1,8 @@
+import os
+import sys
+
+_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if _ROOT not in sys.path:
+    sys.path.insert(0, _ROOT)
+
 from src.hub.web_ui import *