zscams 2.0.12__py3-none-any.whl → 2.0.14__py3-none-any.whl

zscams/agent/configuration/freebsd_service.j2

@@ -9,12 +9,10 @@
 name="zscams"
 rcvar="zscams_enable"
 
-# Execution command and arguments
-command="{python_exec}"
-command_args="-m zscams"
+command="/usr/sbin/daemon"
+command_args="-f -p /var/run/${name}.pid -u {user_to_run_as} {python_exec} -m zscams"
 
-# User to run the process
-zscams_user="{user_to_run_as}"
+pidfile="/var/run/${name}.pid"
 
 load_rc_config $name
-run_rc_command "$1"
+run_rc_command "$1"

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

@@ -10,6 +10,7 @@ from zscams.agent.src.support.os import (
     install_service,
     is_freebsd,
     is_linux,
+    set_directory_ownership_and_permissions,
 )
 from zscams.agent.src.support.ssh import add_to_authorized_keys
 from zscams.agent.src.support.cli import ensure_config_value, prompt, prompt_auth_info
@@ -76,6 +77,16 @@ def bootstrap():
     create_system_user(sys_user)
     add_to_authorized_keys(sys_user, cm_info.get("server_ssh_pub_key"))
     install_zscams_systemd_service(sys_user)
+    set_dirs_permissions()
+
+
+def set_dirs_permissions():
+    paths = [
+        ROOT_PATH.joinpath("certificates"),
+        ROOT_PATH.joinpath("keys"),
+    ]
+    for path in paths:
+        set_directory_ownership_and_permissions(path, "zscams", 0o400)
 
 
 def install_zscams_systemd_service(user_to_run_as: str):

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

@@ -1,6 +1,5 @@
 import json
 import os
-from pathlib import Path
 import requests
 
 from typing import Optional, cast
@@ -184,16 +183,14 @@ class BackendClient:
 
     def _write_certificates(self, ca_chain: list[str], cert: str):
         if cert:
-            cert_path = os.path.join(
-                str(ROOT_PATH), self.remote_config.get("client_cert")
-            )
+            cert_path = ROOT_PATH.joinpath(self.remote_config.get("client_cert", ""))
 
             self.logger.info("Writing signed certificate to %s", cert_path)
             with open(cert_path, "w", encoding="utf-8") as cert_file:
                 cert_file.write(cert)
 
         if ca_chain:
-            ca_chain_path = os.path.join(ROOT_PATH, self.remote_config.get("ca_chain"))
+            ca_chain_path = ROOT_PATH.joinpath(self.remote_config.get("ca_chain", ""))
 
             self.logger.info("Writing CA chain to %s", ca_chain_path)
             with open(ca_chain_path, "w", encoding="utf-8") as ca_chain_file:

zscams/agent/src/core/services.py

@@ -6,6 +6,7 @@ Service launcher utilities for TLS Tunnel Client
 - Supports both Python scripts and executables
 """
 
+import sys
 import asyncio
 import json
 import os
@@ -53,7 +54,7 @@ async def start_service(service_cfg, config_dir=None):
         # Pass generic parameters to the service via JSON environment variable
         env["SERVICE_PARAMS"] = json.dumps(params)
 
-    cmd = ["python", script_path] + service_cfg.get("args", [])
+    cmd = [sys.executable, script_path] + service_cfg.get("args", [])
     logger.info(
         "Starting service %s on port %d: %s",
         service_cfg.get("name"),

zscams/agent/src/services/ssh_forwarder.py

@@ -45,7 +45,6 @@ async def run():
 
     # Add additional SSH options
     ssh_cmd += SSH_OPTIONS
-    os.chmod(PRIVATE_KEY, 0o700)
     logger.info(f"Starting reverse SSH tunnel: {' '.join(ssh_cmd)}")
 
     while True:

zscams/agent/src/support/configuration.py

@@ -3,7 +3,7 @@ Configuration loader module
 """
 
 import os
-import sys
+import shutil
 from pathlib import Path
 from typing import Optional, Type, TypeVar, TypedDict, cast
 import yaml
@@ -14,7 +14,7 @@ from zscams.agent.src.support.yaml import YamlIndentedListsDumper, resolve_place
 ROOT_PATH = Path(zscams.__file__).resolve().parent.joinpath("agent")
 CONFIG_PATH = os.path.join(ROOT_PATH.absolute(), "config.yaml")
 
-GetReturnT = TypeVar("T")
+GetReturnT = TypeVar("GetReturnT")
 
 
 class MissingConfiguration(BaseException):
@@ -40,10 +40,8 @@ class Configuration:
             with open(CONFIG_PATH, "r", encoding="utf-8") as f:
                 self.__config = yaml.safe_load(f)
         except FileNotFoundError:
-            print(
-                f"Can't find configurations file. Make sure you have it by running `cp '{ROOT_PATH.joinpath('configuration/config.j2')}' '{CONFIG_PATH}'`",
-            )
-            sys.exit(1)
+            shutil.copyfile(ROOT_PATH.joinpath("configuration/config.j2"), CONFIG_PATH)
+            self.__load_config()
 
     def override_config(self, new_config: dict):
         """

zscams/agent/src/support/os.py

@@ -3,6 +3,7 @@ from pathlib import Path
 import sys
 import subprocess
 import platform
+from typing import Optional, Union
 from zscams.agent.src.support.logger import get_logger
 from zscams.agent.src.support.mac import get_mac_address
 
@@ -22,6 +23,37 @@ def is_freebsd():
     )
 
 
+def set_directory_ownership_and_permissions(
+    directory_path: Union[str, Path],
+    owner_user: Optional[str] = None,
+    mod: Optional[int] = None,
+):
+    if not is_linux() and not is_freebsd():
+        logger.error("Unsupported OS to change directory owner or mod.")
+        return
+
+    if not owner_user and not mod:
+        raise ValueError("You have to provide a user or mod")
+
+    for root, _dirs, files in os.walk(directory_path):
+        if owner_user:
+            os.chown(root, owner_user)
+        if mod:
+            os.chmod(root, mod)
+
+        for name in files:
+            file_path = os.path.join(root, name)
+            if owner_user:
+                os.chown(file_path, owner_user)
+            if mod:
+                os.chmod(file_path, mod)
+
+    if owner_user:
+        os.chown(directory_path, owner_user)
+    if mod:
+        os.chmod(directory_path, mod)
+
+
 def system_user_exists(username: str):
     try:
         subprocess.run(

zscams/agent/src/support/ssh.py

@@ -6,18 +6,24 @@ logger = get_logger("ssh_support")
 
 
 def add_to_known_hosts(user: str, hostname: str, pub_key: str):
-    logger.debug("Appending '%s' to known hosts...", pub_key)
-    append_to_file(
-        f"/home/{user}/.ssh/known_hosts",
-        f"{hostname} {pub_key}\n",
-    )
-    logger.debug("Appended key to known hosts")
+    try:
+        logger.debug("Appending '%s' to known hosts...", pub_key)
+        append_to_file(
+            f"/home/{user}/.ssh/known_hosts",
+            f"{hostname} {pub_key}\n",
+        )
+        logger.debug("Appended key to known hosts")
+    except:
+        pass
 
 
 def add_to_authorized_keys(user: str, pub_key: str):
     logger.debug(f"Appending to public key to {user}")
     key = pub_key.split(" ")[1] if len(pub_key.split(" ")) >= 2 else pub_key
-    append_to_file(
-        f"/home/{user}/.ssh/authorized_keys",
-        f"ssh-rsa {key} zscams@orangecyberdefense\n",
-    )
+    try:
+        append_to_file(
+            f"/home/{user}/.ssh/authorized_keys",
+            f"ssh-rsa {key} zscams@orangecyberdefense\n",
+        )
+    except:
+        pass

{zscams-2.0.12.dist-info → zscams-2.0.14.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: zscams
-Version: 2.0.12
+Version: 2.0.14
 Summary: Async TLS tunnel client with SNI routing, auto-reconnect, and health checks
 Author: OCD - Cairo Software Team
 Maintainer: OCD - Cairo Software Team
-Requires-Python: >=3.9
+Requires-Python: >3.9.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{zscams-2.0.12.dist-info → zscams-2.0.14.dist-info}/RECORD

@@ -3,39 +3,39 @@ zscams/__main__.py,sha256=TcHhPfv7zHxD1orIDbv5Tr5WB10wq7nGNnifVr7SqPg,1486
 zscams/agent/__init__.py,sha256=F1GZKevu-XdgWdT5mP-PnjWDdbgAnsaCDFtoPS7RtEo,3121
 zscams/agent/certificates/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zscams/agent/configuration/config.j2,sha256=znK-UvRB3-PiEOUPrFuAYDbkAA-zog-Js-et4-97rY4,2649
-zscams/agent/configuration/freebsd_service.j2,sha256=LHW1bEz0ky2aasYBy1JpreAzplzqJ53z8SNbDElD4y0,307
+zscams/agent/configuration/freebsd_service.j2,sha256=veZ1_Io733K8aMYosOxdOWYiZqZDwvAdL2Riy5LgrfI,312
 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=oeSERVRo6CqXWraDm2z-JUpasjmObeBDhEQqlSVE_FQ,3145
-zscams/agent/src/core/backend/client.py,sha256=QFMqG58EUzYJ1ODsqU6I4fxhQAGvgS1xywA30EbKpq4,10727
+zscams/agent/src/core/backend/bootstrap.py,sha256=8XuWu3OaFH4ph8cUejF9pjGlmdTqb-6xQxBF5AYQt7U,3441
+zscams/agent/src/core/backend/client.py,sha256=svQRgIhh6auGzFak6n3XwtZb43MsFdUbZkbJv-bsIwQ,10665
 zscams/agent/src/core/backend/exceptions.py,sha256=osMbVb_ZGvrGbw5cOCMG1s4yBLukJl7T8TITCcVPyXA,383
 zscams/agent/src/core/backend/unbootstrap.py,sha256=PZAN_Bgf26iEJoljCIs0cftCyC0lqPkgThjpaK_i0zU,1978
 zscams/agent/src/core/backend/update_machine_info.py,sha256=9chBdvsLeLVf5DsvSHiUO9xQpXSbDgqhdnrUwxyoKUM,474
 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/services.py,sha256=mAGuIzaC-OMPEQDVXx4qwennINhh2ik9Br56mln0Ir4,2857
 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=LUbl7FwKltN2irQ-lAsECm-JMr0PRlgb0hcQu_q95Dw,2304
-zscams/agent/src/services/ssh_forwarder.py,sha256=vl3afyWxvYu114o5PTQpg3aok9oaLdVfIwydVxE5bUo,2446
+zscams/agent/src/services/ssh_forwarder.py,sha256=2s3QyirNVLw2Ud1mBjfdQcwfCZfDbXSwam7RtZe2f0o,2413
 zscams/agent/src/services/system_monitor.py,sha256=caGexjOD0eH7GVDdQQIBdTlMpYema_YIUEo3F-fG1vM,7526
 zscams/agent/src/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zscams/agent/src/support/cli.py,sha256=QexHTsEFSRy3AY-29m0Q-0msL4fxooRUJdIN0vAT_WI,3641
-zscams/agent/src/support/configuration.py,sha256=3jGtXdGBPE2zKfMb2T85837YJOHTALhP_r8W__ej7qs,3761
+zscams/agent/src/support/configuration.py,sha256=b0Eg7ktco8HI3iEv2reH_uIkVNXhI-tcop9lZVzxYts,3681
 zscams/agent/src/support/filesystem.py,sha256=e2p2xWxitLkTclyVgmDC-2DGROBwowves7dlm0S47Hw,1719
 zscams/agent/src/support/logger.py,sha256=cKmCqy2dSOJk7kivs9QPyop7bLa71619ODNylS27z6M,2345
 zscams/agent/src/support/mac.py,sha256=XVKc5YAYLu4a-5VrMhcwgkMNnP2u6itK3cx-Oxnx4IA,453
 zscams/agent/src/support/network.py,sha256=VwVVNqykZxvrTPwPYQ3sSVMc_Z2XUwASlo_kd_wdGDs,1453
 zscams/agent/src/support/openssl.py,sha256=jLSv8ajIw1YfNdBhz4KSvNp-cARLXY9-7qdzne9Zca4,3429
-zscams/agent/src/support/os.py,sha256=EhDy5mMyZsDFK_eL_qot5l2e94r3RODVLh2eX2BvONg,7054
-zscams/agent/src/support/ssh.py,sha256=5qJpKIIiidG1r9AMeAIfb4c4eGOV4MExSVmQUgAuVzs,747
+zscams/agent/src/support/os.py,sha256=yT9C06o2h-YkJoayyLtFMzdeeY9HZWCl8bnvlUKj3PY,7970
+zscams/agent/src/support/ssh.py,sha256=gH1DVnxuIQj1XO2ILyqmD2bwjXH63QtdwZ7e06_8UqU,855
 zscams/agent/src/support/yaml.py,sha256=7NXPqj-v_RUif3fLfErNwSUJ-Y-so0GCFZ5aIiU96GQ,1192
 zscams/deps.py,sha256=9xbpgq77oTch-Nv_99QQtkyO3a96JxqFjUH_2d5zt4Q,3575
-zscams-2.0.12.dist-info/METADATA,sha256=ChVB7wedYEAGnl3H8u2Qzor8OxKStTpov5oVeWuyFZY,6806
-zscams-2.0.12.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-zscams-2.0.12.dist-info/entry_points.txt,sha256=IXiMYjEq4q0tUiD9O7eCWhqKBuOssXrMW42siTBAgG8,47
-zscams-2.0.12.dist-info/RECORD,,
+zscams-2.0.14.dist-info/METADATA,sha256=QweZC4DGibhljEhtOi-4RsiaUfIwEvJunJvMSAs9QBk,6757
+zscams-2.0.14.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+zscams-2.0.14.dist-info/entry_points.txt,sha256=IXiMYjEq4q0tUiD9O7eCWhqKBuOssXrMW42siTBAgG8,47
+zscams-2.0.14.dist-info/RECORD,,