ssm-cli 1.1.0.dev2__tar.gz → 1.1.0.dev4__tar.gz

{ssm_cli-1.1.0.dev2/ssm_cli.egg-info → ssm_cli-1.1.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssm-cli
-Version: 1.1.0.dev2
+Version: 1.1.0.dev4
 Summary: CLI tool to help with SSM functionality, aimed at adminstrators
 Author-email: Simon Fletcher <simon.fletcher@lexisnexisrisk.com>
 License: MIT License
@@ -39,6 +39,7 @@ Requires-Dist: rich
 Requires-Dist: confclasses>=0.3.2
 Requires-Dist: xdg_base_dirs
 Requires-Dist: rich-click
+Requires-Dist: psutil
 Dynamic: license-file
 
 # SSM CLI

{ssm_cli-1.1.0.dev2 → ssm_cli-1.1.0.dev4}/pyproject.toml

@@ -22,7 +22,8 @@ dependencies = [
     "rich",
     "confclasses>=0.3.2",
     "xdg_base_dirs",
-    "rich-click"
+    "rich-click",
+    "psutil"
 ]
 dynamic = ["version"]
 

{ssm_cli-1.1.0.dev2 → ssm_cli-1.1.0.dev4}/ssm_cli/logging.py

@@ -20,9 +20,8 @@ def setup_logging(name:str = "cli"):
 
 def set_log_level(level: str, name: Optional[str] = None):
     """Configure logger level."""
-    logger.debug(f"setting logger {name} to {level}")
     logging.getLogger(name).setLevel(level.upper())
-
+    logger.debug(f"setting logger {name} to {level}")
 
 def cleanup_old_logs(days_to_keep: int = 7):
     """Clean up log files older than specified days. Runs with no error handling."""

{ssm_cli-1.1.0.dev2 → ssm_cli-1.1.0.dev4}/ssm_cli/ssh_proxy/forwarding.py

@@ -15,6 +15,7 @@ The manager side is the code that runs in a separate process and is responsible
 """
 
 import io
+import os
 import socket
 from typing import Dict, Any, List
 import time
@@ -209,11 +210,12 @@ class PortForwardingManagerProcess(multiprocessing.Process):
     def __init__(self, pipe: Connection, instance: Instance):
         self.pipe = pipe
         self.instance = instance
+        self.parent_pid = os.getppid()
 
         with io.StringIO() as f:
             save(CONFIG, f)
             self.config_yaml = f.getvalue()
-            
+
         super().__init__()
     
     def run(self):
@@ -222,16 +224,62 @@ class PortForwardingManagerProcess(multiprocessing.Process):
         # when config/args are refactored, this should be taken into account.
         from ssm_cli.logging import setup_logging, set_log_level
         setup_logging("manager")
+
+        with io.StringIO(self.config_yaml) as f:
+            load(CONFIG, f)
+        
         set_log_level(CONFIG.log.level)
         for logger_name, level in CONFIG.log.loggers.items():
             set_log_level(level, name=logger_name)
         
-        with io.StringIO(self.config_yaml) as f:
-            load(CONFIG, f)
+
+        logger.info("manager process started")
+
+        # get parent process object
+        import psutil
+        try:
+            self.parent = psutil.Process(self.parent_pid)
+        except (psutil.NoSuchProcess, psutil.AccessDenied) as e:
+            logger.warning(f"Could not get parent process object: {e}")
+
+        # detaching from parent
+        try:
+            self.detatch_from_proxy()
+        except Exception as e:
+            logger.error(f"failed to detatch from proxy: {e}")
+
+        # cleanup handlers
+        import atexit
+        self.cleanup_called = False
+        atexit.register(self.safe_cleanup)
+
         self.sessions = []
         self.pipe.send("ready")
         while True:
-            try:
+            if not self.parent.is_running():
+                logger.info("proxy process is no longer running, exiting manager process")
+                break
+            if not self.process_messages():
+                logger.info("proxy pipe closed, exiting manager process")
+                break
+        
+        self.safe_cleanup()
+    
+    def safe_cleanup(self):
+        """ Used to ensure cleanup only called once """
+        if self.cleanup_called:
+            return
+        self.cleanup_called = True
+        self.cleanup()
+        
+    def cleanup(self):
+        """ Any cleanup tasks go here """
+        logger.info("cleaning up")
+        self.close_all_sessions()
+
+    def process_messages(self):
+        try:
+            if self.pipe.poll(timeout=1.0):
                 msg, data = self.pipe.recv()
                 logger.debug(f"received {msg} {data} from proxy")
                 reply = None
@@ -245,9 +293,12 @@ class PortForwardingManagerProcess(multiprocessing.Process):
                 if reply is not None:
                     logger.debug(f"sending {reply} to proxy")
                     self.pipe.send(reply)
-            except EOFError:
-                break
-
+            
+            return True
+        except (EOFError, OSError) as e:
+            logger.warning(f"pipe to proxy closed: {e}")
+            return False
+        
     def open_session(self, host: str, remote_port: int):
         session = None
         for s in self.sessions:
@@ -270,6 +321,12 @@ class PortForwardingManagerProcess(multiprocessing.Process):
             if session.session_id == session_id:
                 session.close()
                 self.sessions.remove(session)
+                break
+    
+    def close_all_sessions(self):
+        for session in self.sessions:
+            session.close()
+        self.sessions = []
 
     def is_open(self, session_id: str) -> bool:
         for session in self.sessions:
@@ -280,6 +337,36 @@ class PortForwardingManagerProcess(multiprocessing.Process):
                     self.sessions.remove(session)
                     break
         return False
+    
+    def detatch_from_proxy(self):
+        """Detach from the parent process to avoid zombies on unix like systems, this will need refining after more testing"""
+        if os.name != 'nt':
+            os.setsid()
+        else:
+            import ctypes
+            kernel32 = ctypes.windll.kernel32
+
+            # Set up independent console control handler
+            kernel32.SetConsoleCtrlHandler(None, True)
+
+            # Set independent process priority
+            current_process = kernel32.GetCurrentProcess()
+            NORMAL_PRIORITY_CLASS = 0x00000020
+            kernel32.SetPriorityClass(current_process, NORMAL_PRIORITY_CLASS)
+
+            # Detach from console if present
+            console_window = kernel32.GetConsoleWindow()
+            if console_window:
+                kernel32.FreeConsole()
+
+            # Break out of job object (most important)
+            ntdll = ctypes.windll.ntdll            
+            ntdll.NtSetInformationProcess(
+                kernel32.GetCurrentProcess(),
+                0x11,
+                ctypes.byref(ctypes.c_ulong(0)),
+                ctypes.sizeof(ctypes.c_ulong)
+            )
 
 def get_free_port(bind_host="127.0.0.1"):
     """

{ssm_cli-1.1.0.dev2 → ssm_cli-1.1.0.dev4/ssm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssm-cli
-Version: 1.1.0.dev2
+Version: 1.1.0.dev4
 Summary: CLI tool to help with SSM functionality, aimed at adminstrators
 Author-email: Simon Fletcher <simon.fletcher@lexisnexisrisk.com>
 License: MIT License
@@ -39,6 +39,7 @@ Requires-Dist: rich
 Requires-Dist: confclasses>=0.3.2
 Requires-Dist: xdg_base_dirs
 Requires-Dist: rich-click
+Requires-Dist: psutil
 Dynamic: license-file
 
 # SSM CLI

{ssm_cli-1.1.0.dev2 → ssm_cli-1.1.0.dev4}/ssm_cli.egg-info/requires.txt

@@ -4,3 +4,4 @@ rich
 confclasses>=0.3.2
 xdg_base_dirs
 rich-click
+psutil