zscams 2.0.6__tar.gz → 2.0.7__tar.gz

{zscams-2.0.6 → zscams-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zscams
-Version: 2.0.6
+Version: 2.0.7
 Summary: Async TLS tunnel client with SNI routing, auto-reconnect, and health checks
 Author: OCD - Cairo Software Team
 Maintainer: OCD - Cairo Software Team

{zscams-2.0.6 → zscams-2.0.7}/pyproject.toml

@@ -3,7 +3,7 @@ name = "zscams_agent"
 
 [tool.poetry]
 name = "zscams"
-version = "2.0.6"
+version = "2.0.7"
 description = "Async TLS tunnel client with SNI routing, auto-reconnect, and health checks"
 authors = ["OCD - Cairo Software Team"]
 maintainers = ["OCD - Cairo Software Team"]

{zscams-2.0.6 → zscams-2.0.7}/zscams/agent/configuration/config.j2

@@ -39,7 +39,7 @@ services:
     custom_port_name: "reverse_port"
     params:
       local_port: 4422
-      private_key: zscams/agent/keys/autoport.key
+      private_key: keys/autoport.key
       remote_host: localhost
       reverse_port: "{reverse_port}"
       server_ssh_user: ssh_user
@@ -52,7 +52,7 @@ services:
     port: 22
     prerequisites:
       files:
-        - zscams/agent/keys/autoport.key
+        - keys/autoport.key
       ports:
         - 22
       services: []

{zscams-2.0.6 → zscams-2.0.7}/zscams/agent/src/core/prerequisites.py

@@ -1,9 +1,12 @@
+import os
 from zscams.agent.src.support.logger import get_logger
 from zscams.agent.src.support.filesystem import is_file_exists
 from zscams.agent.src.core import running_services
 from zscams.agent.src.support.network import is_port_open, is_service_running
+from zscams.agent.src.support.configuration import CONFIG_PATH
 
 logger = get_logger("service_prerequisites")
+config_dir = os.path.dirname(CONFIG_PATH)
 
 
 def check_prerequisites(prereqs: dict) -> bool:
@@ -18,7 +21,7 @@ def check_prerequisites(prereqs: dict) -> bool:
 
     # Check file prerequisites
     for path in prereqs.get("files", []):
-        results.append(is_file_exists(path, logger))
+        results.append(is_file_exists(path, logger, config_dir))
 
     # Check port prerequisites
     for port in prereqs.get("ports", []):

{zscams-2.0.6 → zscams-2.0.7}/zscams/agent/src/services/reverse_ssh.py

@@ -4,6 +4,7 @@ import os
 import sys
 from zscams.agent.src.support.logger import get_logger
 from zscams.agent.src.support.filesystem import resolve_path
+from zscams.agent.src.support.configuration import CONFIG_PATH
 
 logger = get_logger("autossh_service")
 
@@ -14,11 +15,11 @@ if not params_env:
     sys.exit(1)
 
 params = json.loads(params_env)
-
+config_dir = os.path.dirname(CONFIG_PATH)
 LOCAL_PORT = params.get("local_port", 4422)
 SERVER_SSH_USER = params.get("server_ssh_user", "ssh_user")
 REVERSE_PORT = params.get("reverse_port", 2222)
-PRIVATE_KEY = resolve_path(params.get("private_key"))  # Path to RSA key
+PRIVATE_KEY = resolve_path(params.get("private_key"), config_dir)  # Path to RSA key
 SSH_OPTIONS = params.get("ssh_options", [])
 CHECK_INTERVAL = 120  #
 

{zscams-2.0.6 → zscams-2.0.7}/zscams/agent/src/services/ssh_forwarder.py

@@ -4,6 +4,7 @@ import os
 import sys
 from zscams.agent.src.support.logger import get_logger
 from zscams.agent.src.support.filesystem import resolve_path
+from zscams.agent.src.support.configuration import CONFIG_PATH
 
 logger = get_logger("autossh_service")
 
@@ -14,13 +15,13 @@ if not params_env:
     sys.exit(1)
 
 params = json.loads(params_env)
-
+config_dir = os.path.dirname(CONFIG_PATH)
 FORWARDER_PORT = params.get("forwarder_port", 4422)
 LOCAL_PORT = params.get("local_port", 4422)
 REMOTE_PORT = params.get("remote_port", 4422)
 REMOTE_HOST = params.get("remote_host", "localhost")
 SERVER_SSH_USER = params.get("server_ssh_user", "ssh_user")
-PRIVATE_KEY = resolve_path(params.get("private_key"))  # Path to RSA key
+PRIVATE_KEY = resolve_path(params.get("private_key"), config_dir)  # Path to RSA key
 SSH_OPTIONS = params.get("ssh_options", [])
 CHECK_INTERVAL = 120  #
 

{zscams-2.0.6 → zscams-2.0.7}/zscams/agent/src/support/filesystem.py

@@ -9,6 +9,7 @@ from zscams.agent.src.support.logger import get_logger
 
 logger = get_logger("FileSystem")
 
+
 def resolve_path(path: Optional[str], base_dir: Optional[str] = None) -> Optional[str]:
     """
     Resolve a file path relative to a base directory.
@@ -34,9 +35,12 @@ def ensure_dir(path: str):
     os.makedirs(path, exist_ok=True)
 
 
-def is_file_exists(path, logger):
+def is_file_exists(path, logger, base_dir=None):
     """Check if file exists."""
-    if os.path.exists(path):
+    absolute_path = resolve_path(path, base_dir)
+    if os.path.exists(path) or os.path.exists(
+        Path(absolute_path if absolute_path else __file__)
+    ):
         logger.debug(f"File exists: {path}")
         return True
 
@@ -50,7 +54,7 @@ def append_to_file(path: str | Path, content: str):
             path = Path(path)
 
         if not path.parent.exists():
-            os.mkdir(path.parent,0o700)
+            os.mkdir(path.parent, 0o700)
 
         with open(path, "a", encoding="utf-8") as file:
             file.write(content)
@@ -58,6 +62,7 @@ def append_to_file(path: str | Path, content: str):
         logger.error(exception)
         raise exception
 
+
 def write_to_file(path: str | Path, content: str):
     with open(path, "w", encoding="utf-8") as f:
         f.write(content)