Bootstrap sys.path in root proxy files and add PYTHONPATH to CI workflow
CI Test Suite / Run Component Tests & Pipeline Verification (push) Failing after 1m43s
CI Test Suite / Run Component Tests & Pipeline Verification (push) Failing after 1m43s
This commit is contained in:
+14
-4
@@ -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_public_key": server_conf["public_key"],
|
||||
"auth_token": server_conf["auth_token"]
|
||||
"server_fingerprint": server_conf.get("server_fingerprint", ""),
|
||||
"server_public_key": server_conf.get("public_key", ""),
|
||||
"auth_token": server_conf.get("auth_token", "")
|
||||
}
|
||||
|
||||
out_dir = os.path.dirname(os.path.abspath(output_path))
|
||||
|
||||
Reference in New Issue
Block a user