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

zscams/__main__.py

@@ -6,6 +6,7 @@ import asyncio
 import sys
 import os
 from zscams.agent.src.core.backend.bootstrap import bootstrap
+from zscams.agent.src.core.backend.unbootstrap import unbootstrap
 from zscams.agent.src.core.backend.update_machine_info import update_machine_info
 from zscams.agent.src.support.logger import get_logger
 from zscams.agent import init_parser, ensure_bootstrapped, run
@@ -32,6 +33,17 @@ def main():
         update_machine_info()
         sys.exit(0)
 
+    if args.unbootstrap:
+        try:
+            if os.geteuid() != 0:
+                logger.error("You are NOT running as root.")
+                sys.exit(1)
+            unbootstrap()
+            sys.exit(0)
+        except Exception as exception:
+            logger.error(exception)
+            sys.exit(1)
+
     try:
         ensure_bootstrapped()
         asyncio.run(run())

zscams/agent/__init__.py

@@ -22,10 +22,15 @@ def init_parser():
         action="store_true",
         help="Run bootstrap process and exit",
     )
+    parser.add_argument(
+        "--unbootstrap",
+        action="store_true",
+        help="Run unbootstrap process and exit",
+    )
     parser.add_argument(
         "--update-machine-info",
         action="store_true",
-        help="Run bootstrap process and exit",
+        help="Reinitialize machine info",
     )
     return parser
 

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

@@ -4,7 +4,7 @@ import sysconfig
 import sys
 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.configuration import reinitialize, CONFIG_PATH
 from zscams.agent.src.support.logger import get_logger
 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
@@ -47,6 +47,8 @@ def bootstrap():
         f"{equipment_type.lower()}-{customer_name.lower()}-{connector_name.lower()}"
     )
     enforced_id = prompt("Enforced ID", "Enforced Agent ID")
+    if not os.path.exists(CONFIG_PATH):
+        os.remove(CONFIG_PATH)
     reinitialize(equipment_name=equipment_name, equipment_type=equipment_type)
     cm_info = backend_client.bootstrap(equipment_name, enforced_id or None)
 

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

@@ -0,0 +1,49 @@
+import os
+from zscams.agent.src.support.filesystem import resolve_path
+from zscams.agent.src.support.configuration import get_config, CONFIG_PATH, ROOT_PATH
+from zscams.agent.src.core.backend.client import BackendClient
+from zscams.agent.src.support.logger import get_logger
+from zscams.agent.src.support.os import remove_service, is_freebsd
+
+logger = get_logger("Unbootstrap")
+
+
+def unbootstrap():
+    remote_configs = get_config().get("remote", {})
+    backend_config = get_config().get("backend", {})
+    private_key_path = resolve_path(
+        remote_configs.get("client_key"), os.path.dirname(CONFIG_PATH)
+    )
+
+    cert_path = resolve_path(
+        remote_configs.get("client_key"), os.path.dirname(CONFIG_PATH)
+    )
+
+    ca_chain_path = resolve_path(
+        remote_configs.get("client_key"), os.path.dirname(CONFIG_PATH)
+    )
+
+    cache_path = os.path.join(
+        ROOT_PATH.parent,
+        backend_config.get("cache_dir"),
+        BackendClient.MACHINE_INFO_FILE_NAME,
+    )
+
+    if os.path.exists(private_key_path):
+        os.remove(private_key_path)
+        logger.debug("Removed private key")
+
+    if os.path.exists(cert_path):
+        os.remove(cert_path)
+        logger.debug("Removed certificate")
+
+    if os.path.exists(ca_chain_path):
+        os.remove(ca_chain_path)
+        logger.debug("Removed CA Chain")
+
+    if os.path.exists(cache_path):
+        os.remove(cache_path)
+        logger.debug("Removed Machine info")
+
+    remove_service("zscams" if is_freebsd() else "zscams.service")
+    logger.debug("Removed ZSCAMs service")

zscams/agent/src/services/reverse_ssh.py

@@ -43,7 +43,7 @@ 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/services/ssh_forwarder.py

@@ -45,7 +45,7 @@ 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/services/system_monitor.py

@@ -10,6 +10,7 @@ import socket
 import platform
 from zscams.agent.src.support.logger import get_logger
 from http.client import BadStatusLine, HTTPConnection, HTTPException
+
 logger = get_logger("system_monitor")
 
 # Load service-specific params from environment
@@ -30,8 +31,6 @@ SERVICE_NAME = params.get("service_name", "Zscaler-AppConnector")
 HOSTNAME = platform.node()
 
 
-
-
 def network():
     """
     Collect network interfaces and their statistics.
@@ -232,7 +231,6 @@ def log():
     }
 
 
-
 # -----------------------------
 # Helper function to log JSON
 # -----------------------------
@@ -249,13 +247,14 @@ async def send_json_log(payload: dict):
 
 
 async def schedule_task(interval):
-    while (True):
+    while True:
         try:
             await send_json_log(log())
         except Exception as exception:
             print(exception)
         await asyncio.sleep(interval)
 
+
 if __name__ == "__main__":
     try:
         asyncio.run(schedule_task(30))

zscams/agent/src/support/filesystem.py

@@ -48,7 +48,7 @@ def is_file_exists(path, logger, base_dir=None):
     return False
 
 
-def append_to_file(path: str | Path, content: str):
+def append_to_file(path, content: str):
     try:
         if isinstance(path, str):
             path = Path(path)
@@ -63,6 +63,6 @@ def append_to_file(path: str | Path, content: str):
         raise exception
 
 
-def write_to_file(path: str | Path, content: str):
+def write_to_file(path: str, content: str):
     with open(path, "w", encoding="utf-8") as f:
         f.write(content)

zscams/agent/src/support/os.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import subprocess
 import platform
@@ -136,3 +137,53 @@ def install_systemd_service(service_name: str, content: str):
             service_name,
             service_name,
         )
+
+
+def remove_service(service_name: str):
+    """
+    Stops, disables, and removes service configurations for Linux and FreeBSD.
+    """
+    # Standardize name (remove .service suffix if present for consistency)
+    clean_name = service_name.replace(".service", "")
+
+    if is_linux():
+        _remove_systemd_service(clean_name)
+    elif is_freebsd():
+        _remove_rc_service(clean_name)
+    else:
+        logger.error("Unsupported OS for service removal.")
+
+
+def _remove_systemd_service(name: str):
+    service_file = f"/etc/systemd/system/{name}.service"
+    try:
+        logger.info("Stopping and disabling systemd service: %s", name)
+        subprocess.run(["sudo", "systemctl", "stop", name], check=False)
+        subprocess.run(["sudo", "systemctl", "disable", name], check=False)
+
+        if os.path.exists(service_file):
+            subprocess.run(["sudo", "rm", service_file], check=True)
+            subprocess.run(["sudo", "systemctl", "daemon-reload"], check=True)
+            logger.info("Systemd service %s removed.", name)
+    except subprocess.CalledProcessError as e:
+        logger.error("Failed to remove systemd service: %s", e)
+
+
+def _remove_rc_service(name: str):
+    rc_file = f"/usr/local/etc/rc.d/{name}"
+    try:
+        logger.info("Stopping and disabling FreeBSD service: %s", name)
+        # 1. Stop the service
+        subprocess.run(["sudo", "service", name, "stop"], check=False)
+
+        # 2. Disable in /etc/rc.conf
+        # Using sysrc -x removes the variable entirely from rc.conf
+        subprocess.run(["sudo", "sysrc", "-x", f"{name}_enable"], check=False)
+
+        # 3. Remove the rc.d script
+        if os.path.exists(rc_file):
+            subprocess.run(["sudo", "rm", rc_file], check=True)
+            logger.info("FreeBSD rc script %s removed.", name)
+
+    except subprocess.CalledProcessError as e:
+        logger.error("Failed to remove FreeBSD service: %s", e)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zscams
-Version: 2.0.7
+Version: 2.0.9
 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.7.dist-info → zscams-2.0.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 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/__main__.py,sha256=-vjCPBc7n_M3Gq7GRu5TWhdxJrPcU_NV1sZEXvUZU58,1432
+zscams/agent/__init__.py,sha256=zGhrb1drq8BP9uvuXeq-L8HhtfWW7s-_1VjVJ-jaykY,3105
 zscams/agent/certificates/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zscams/agent/config.yaml,sha256=0DuIENHlSoo6nRg4Xa0ZljHGgDGQiWSEX8b_uRMtpS0,2542
 zscams/agent/configuration/config.j2,sha256=95lUo1oo_EExGCHIhlBnaeK0cwmr9gUXfh7TYP9WYdg,2633
@@ -9,9 +9,10 @@ zscams/agent/configuration/linux_service.j2,sha256=UOrGrXvBK2mFit_b3QxUAKgZhG-dm
 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=Dvh6Hesy9M-5zX4iQxvSSlX6HD2Ty4vU5EG_nyHWQks,2463
+zscams/agent/src/core/backend/bootstrap.py,sha256=iv06Qoi9TWTA9GjD3L5I-QR6Ydu_f0wArfjoK8nTTjk,2547
 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/unbootstrap.py,sha256=ULY78KGuv-Pcz69L6PyhU_4_xRaMZCrrln1TdejjzBE,1554
 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
@@ -20,23 +21,23 @@ zscams/agent/src/core/tunnel/__init__.py,sha256=BvJmqtjliO-UvmEguOwky8KSGLY_w8xq
 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=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/services/reverse_ssh.py,sha256=LUbl7FwKltN2irQ-lAsECm-JMr0PRlgb0hcQu_q95Dw,2304
+zscams/agent/src/services/ssh_forwarder.py,sha256=vl3afyWxvYu114o5PTQpg3aok9oaLdVfIwydVxE5bUo,2446
+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=6Y0zokhwhWcsmjEosGqq_kMqF3tn4juPpsBmQax1Oyc,1221
 zscams/agent/src/support/configuration.py,sha256=hnJhvJLdL5ElZITDFLybTOHVACBHttWgy8sXhmu75Wc,2025
-zscams/agent/src/support/filesystem.py,sha256=QoqyvIWm0jgIGx51ikopU_mvupBWke_e5KaW-wnTI4A,1738
+zscams/agent/src/support/filesystem.py,sha256=e2p2xWxitLkTclyVgmDC-2DGROBwowves7dlm0S47Hw,1719
 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
 zscams/agent/src/support/openssl.py,sha256=jLSv8ajIw1YfNdBhz4KSvNp-cARLXY9-7qdzne9Zca4,3429
-zscams/agent/src/support/os.py,sha256=g2TYgRLvb1snl236m-TKNqFe6jLTFyIT3YOH9cCKY8Y,4769
+zscams/agent/src/support/os.py,sha256=QxAfj8nhC6EIpN14snIsjF5c2i8tWhtCS4DzWIZBSJc,6691
 zscams/agent/src/support/ssh.py,sha256=J9-XsVc6fGdcTN9CsfmgDRaMnfaWluDUaPGug7BVl6Q,812
 zscams/agent/src/support/yaml.py,sha256=bKsQzXHAgjCxkGzPR8bgaUPB-QHMR3AMEVuvn4RRpnA,1188
 zscams/deps.py,sha256=D2WEI7dLoMnPl_OL7NOSXe-k25p1FFeeGsY1Mh7IIEw,3630
 zscams/lib/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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,,
+zscams-2.0.9.dist-info/METADATA,sha256=axiCExXQy5gZer0CXWD2vfWcICtuxmSG-qQ2nwVVrJU,6805
+zscams-2.0.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+zscams-2.0.9.dist-info/entry_points.txt,sha256=IXiMYjEq4q0tUiD9O7eCWhqKBuOssXrMW42siTBAgG8,47
+zscams-2.0.9.dist-info/RECORD,,