zscams 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

zscams/agent/config.yaml

@@ -39,7 +39,7 @@ services:
     name: Reverse SSH
     params:
       local_port: 4422
-      private_key: zscams/agent/keys/autoport.key
+      private_key: keys/autoport.key
       remote_host: localhost
       reverse_port: 10000
       server_ssh_user: ssh_user

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/agent/configuration/freebsd_service.j2

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# PROVIDE: zscams
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="zscams"
+rcvar="zscams_enable"
+
+# Execution command and arguments
+command="{ python_exec }"
+command_args="-m zscams"
+
+# User to run the process
+zscams_user="{user_to_run_as}"
+
+load_rc_config $name
+run_rc_command "$1"

zscams/agent/configuration/{service.j2 → linux_service.j2}

@@ -5,6 +5,7 @@ After=network.target
 [Service]
 ExecStart={python_exec} -m zscams
 Restart=always
+RestartSec=5
 User={user_to_run_as}
 Environment="PYTHONPATH={pythonpath}"
 

zscams/agent/src/core/backend/bootstrap.py

@@ -6,7 +6,7 @@ from typing import cast
 from zscams.agent.src.core.backend.client import backend_client
 from zscams.agent.src.support.configuration import reinitialize
 from zscams.agent.src.support.logger import get_logger
-from zscams.agent.src.support.os import create_system_user, install_service
+from zscams.agent.src.support.os import create_system_user, install_service, is_freebsd
 from zscams.agent.src.support.ssh import add_to_authorized_keys
 from zscams.agent.src.support.cli import prompt
 
@@ -67,10 +67,11 @@ def install_zscams_systemd_service(user_to_run_as: str):
     import zscams
 
     BASE_DIR = Path(zscams.__file__).resolve().parent
-    template_path = f"{BASE_DIR}/agent/configuration/service.j2"
+    filename = "linux_service.j2" if is_freebsd() else "freebsd_service.j2"
+    template_path = f"{BASE_DIR}/agent/configuration/{filename}.j2"
     with open(template_path) as f:
         template = f.read()
 
     rendered_config = template.format(**data)
 
-    install_service("zscams.service", rendered_config)
+    install_service("zscams" if is_freebsd() else "zscams.service", rendered_config)

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/agent/src/services/reverse_ssh.py

@@ -3,6 +3,8 @@ import json
 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")
 
@@ -13,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 = 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/agent/src/services/ssh_forwarder.py

@@ -3,6 +3,8 @@ import json
 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")
 
@@ -13,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 = 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/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)

zscams/deps.py

@@ -15,6 +15,18 @@ def ensure_native_deps():
         platform.system().lower() != "freebsd"
         and platform.system().lower() != "zscaleros"
     ):
+        # --- Linux/Standard Path ---
+        # On Linux, we just use pip to install the missing pieces
+        # We use 'PyYAML' instead of 'yaml' for pip
+        deps_map = ["cryptography", "pyyaml", "psutil"]
+        # Identify which modules are actually missing
+        missing_mods = [mod for mod in deps_map if not is_installed(mod)]
+        if not missing_mods:
+            return  # Everything is already installed
+        print(f"--> Installing via pip: {missing_mods}")
+        subprocess.run(
+            [sys.executable, "-m", "pip", "install"] + missing_mods, check=True
+        )
         return
 
     # 1. Define what we need and how FreeBSD names them
@@ -81,6 +93,6 @@ def ensure_native_deps():
         print("--> Please restart your command to apply changes.")
         sys.exit(0)
     except subprocess.CalledProcessError:
-        print("--> Error: Failed to install packages. Check your internet connection.")
+        print(f"--> Error: Failed to install packages. Check your internet connection.")
         print(f"--> Manual command: sudo pkg install {' '.join(targets)}")
         sys.exit(1)

{zscams-2.0.5.dist-info → zscams-2.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zscams
-Version: 2.0.5
+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
@@ -11,10 +11,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: PyYAML ; sys_platform not in "freebsd"
-Requires-Dist: cryptography ; sys_platform not in "freebsd"
 Requires-Dist: getmac
-Requires-Dist: psutil ; sys_platform not in "freebsd"
 Requires-Dist: requests
 Description-Content-Type: text/markdown
 

{zscams-2.0.5.dist-info → zscams-2.0.7.dist-info}/RECORD

@@ -2,30 +2,31 @@ zscams/__init__.py,sha256=xAeDJU2cSBrdspt5aVRTYIzAbGSGvn-CtGV4qc7moQ0,59
 zscams/__main__.py,sha256=J3ArryUM5B-nVwMMNPmDGRHctehDF9ZaGGHfLHiP1jI,1055
 zscams/agent/__init__.py,sha256=CKNRkV_frJyFrnFU0Nrf6xp4Ja4a_w7j7qrja_h8VUU,2976
 zscams/agent/certificates/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zscams/agent/config.yaml,sha256=S50bDUpyNg8gqM338TlYbX4d27mR2RrFajWINpkSliE,2555
-zscams/agent/configuration/config.j2,sha256=DLkSd-opbPzFLvNipnPLx-OsUpISlZprPzabYjPF1-E,2659
-zscams/agent/configuration/service.j2,sha256=B8t9eCmMbDOEu5kS3pIRdYb7Eh65Vacq0qSqoILgeC8,212
+zscams/agent/config.yaml,sha256=0DuIENHlSoo6nRg4Xa0ZljHGgDGQiWSEX8b_uRMtpS0,2542
+zscams/agent/configuration/config.j2,sha256=95lUo1oo_EExGCHIhlBnaeK0cwmr9gUXfh7TYP9WYdg,2633
+zscams/agent/configuration/freebsd_service.j2,sha256=d0Nh6WJFGw7PhO_dfUjECx2NXTGagalvuIE0aulXIYE,309
+zscams/agent/configuration/linux_service.j2,sha256=UOrGrXvBK2mFit_b3QxUAKgZhG-dmKV8-45bksxL4NE,225
 zscams/agent/keys/autoport.key,sha256=hZBmtw_nLsZwe11LYlwLL-P_blQ_qpUDpFwvqOZDZFE,1679
 zscams/agent/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zscams/agent/src/core/__init__.py,sha256=CEDwvbxojtNZOfOOFBj-URg4Q0KB0cq9AqIiD0uzPic,24
-zscams/agent/src/core/backend/bootstrap.py,sha256=9wwnaXZ40cu5eCwlFtZQ3CiLKWVcNRd7jDEmjG62OAg,2342
+zscams/agent/src/core/backend/bootstrap.py,sha256=Dvh6Hesy9M-5zX4iQxvSSlX6HD2Ty4vU5EG_nyHWQks,2463
 zscams/agent/src/core/backend/client.py,sha256=xZw2GuOVw6Ek-QI9OaUO4rqzIrs4xGwiPizBLCH89fo,10123
 zscams/agent/src/core/backend/exceptions.py,sha256=osMbVb_ZGvrGbw5cOCMG1s4yBLukJl7T8TITCcVPyXA,383
 zscams/agent/src/core/backend/update_machine_info.py,sha256=9chBdvsLeLVf5DsvSHiUO9xQpXSbDgqhdnrUwxyoKUM,474
-zscams/agent/src/core/prerequisites.py,sha256=LNPjDj2AQhZ3xBiLDNurG2osBTjepcU6tzDIm5PT_GA,1159
+zscams/agent/src/core/prerequisites.py,sha256=5OlXBEg8FaYp6LXjJHtbdcpRaMywR-DBDyvDr_OiVdA,1286
 zscams/agent/src/core/service_health_check.py,sha256=9VUWQitXcDEwLcHTTeequi6om98OXN-JIIMZCCH5y4A,1733
 zscams/agent/src/core/services.py,sha256=GvAYODh1Pg_FatnZO_8iqReiIeBfq7Hfwj9zxlXYm-0,2840
 zscams/agent/src/core/tunnel/__init__.py,sha256=BvJmqtjliO-UvmEguOwky8KSGLY_w8xqM67Q3v2_jc0,4658
 zscams/agent/src/core/tunnel/tls.py,sha256=EIRR7aLq6BkW6jUVseM1YCqm7E_UDVSQ9CffQri2U6U,2006
 zscams/agent/src/core/tunnels.py,sha256=FwYi9cV3V7c_su5cEgXmyNdr8VyfCBKzU5olvi2MzBw,1736
 zscams/agent/src/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zscams/agent/src/services/reverse_ssh.py,sha256=-q9RJwyUvzSDftP7NNSmfHJHbx-2vmYrMy9KEjUmlyU,2081
-zscams/agent/src/services/ssh_forwarder.py,sha256=BZ7-9i2YxdxtVfaxu5JDkwhFyNKDruIkph10bT6Ms-g,2223
+zscams/agent/src/services/reverse_ssh.py,sha256=4NeS8TIq48VoUpq6CFcUrEl97qkd2L1yWAs7qlyvSzE,2272
+zscams/agent/src/services/ssh_forwarder.py,sha256=O6V89DRpohkk_Gwg_FrHD4sv9hTS45VpBUcuXv7CRO4,2414
 zscams/agent/src/services/system_monitor.py,sha256=7VeSYHbr1Lv8tGVg0AMMd5_o7EgMGuRDlxJjxpGM27g,7529
 zscams/agent/src/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zscams/agent/src/support/cli.py,sha256=6Y0zokhwhWcsmjEosGqq_kMqF3tn4juPpsBmQax1Oyc,1221
 zscams/agent/src/support/configuration.py,sha256=hnJhvJLdL5ElZITDFLybTOHVACBHttWgy8sXhmu75Wc,2025
-zscams/agent/src/support/filesystem.py,sha256=jSVsnBFFBx8dFT3LzuVkGkK9CF1PScLxbyC_0vPkrRg,1587
+zscams/agent/src/support/filesystem.py,sha256=QoqyvIWm0jgIGx51ikopU_mvupBWke_e5KaW-wnTI4A,1738
 zscams/agent/src/support/logger.py,sha256=rKjAVO6vDeXYTM9__q2lcc1PBiJoZUqLzry8yMf71vY,2347
 zscams/agent/src/support/mac.py,sha256=XVKc5YAYLu4a-5VrMhcwgkMNnP2u6itK3cx-Oxnx4IA,453
 zscams/agent/src/support/network.py,sha256=VwVVNqykZxvrTPwPYQ3sSVMc_Z2XUwASlo_kd_wdGDs,1453
@@ -33,9 +34,9 @@ zscams/agent/src/support/openssl.py,sha256=jLSv8ajIw1YfNdBhz4KSvNp-cARLXY9-7qdzn
 zscams/agent/src/support/os.py,sha256=g2TYgRLvb1snl236m-TKNqFe6jLTFyIT3YOH9cCKY8Y,4769
 zscams/agent/src/support/ssh.py,sha256=J9-XsVc6fGdcTN9CsfmgDRaMnfaWluDUaPGug7BVl6Q,812
 zscams/agent/src/support/yaml.py,sha256=bKsQzXHAgjCxkGzPR8bgaUPB-QHMR3AMEVuvn4RRpnA,1188
-zscams/deps.py,sha256=ECPq9cM9Z5zyp-S7YDPv1Pz7O-yA7ZoMSnsvI9ZDtxg,3035
+zscams/deps.py,sha256=D2WEI7dLoMnPl_OL7NOSXe-k25p1FFeeGsY1Mh7IIEw,3630
 zscams/lib/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zscams-2.0.5.dist-info/METADATA,sha256=qwp-h0yZ7wg1c1clKRT48eOiYXM5ziZcDskIyvILbTA,6973
-zscams-2.0.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-zscams-2.0.5.dist-info/entry_points.txt,sha256=IXiMYjEq4q0tUiD9O7eCWhqKBuOssXrMW42siTBAgG8,47
-zscams-2.0.5.dist-info/RECORD,,
+zscams-2.0.7.dist-info/METADATA,sha256=MKMIfFRXQNLJMR-Fzhpn_ezncJJ_gcNyXqARWSFlL4A,6805
+zscams-2.0.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+zscams-2.0.7.dist-info/entry_points.txt,sha256=IXiMYjEq4q0tUiD9O7eCWhqKBuOssXrMW42siTBAgG8,47
+zscams-2.0.7.dist-info/RECORD,,