ssm-cli 1.1.0.dev3__tar.gz → 1.1.0.dev5__tar.gz

{ssm_cli-1.1.0.dev3/ssm_cli.egg-info → ssm_cli-1.1.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssm-cli
-Version: 1.1.0.dev3
+Version: 1.1.0.dev5
 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.dev3 → ssm_cli-1.1.0.dev5}/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.dev3 → ssm_cli-1.1.0.dev5}/ssm_cli/app.py

@@ -109,8 +109,12 @@ def sshproxy(group):
 
     logger.info(f"connecting to {repr(instance)}")
     
-    server = ssm_cli.ssh_proxy.server.SshServer(instance)
-    server.start()
+    try:
+        server = ssm_cli.ssh_proxy.server.SshServer(instance)
+        server.start()
+    except Exception as e:
+        logger.info(f"hiding exceptions in sshproxy {e}")
+        server.event.set()
 
 @app.command(help="setups up ssm-cli, can be rerun safely")
 @click.option("--replace-config", is_flag=True, help="if we should replace existing config file")

{ssm_cli-1.1.0.dev3 → ssm_cli-1.1.0.dev5}/ssm_cli/instances.py

@@ -153,8 +153,10 @@ class Instances:
         instances = sorted(self.list_instances(group_tag_value), key=lambda x: ip_as_int(x.ip))
         count = len(instances)
         if count == 1:
+            logger.info("only one instance found, selecting it automatically")
             return instances[0]
         if count < 1:
+            logger.error("no instances found")
             return
         
         if selector not in SELECTORS:

{ssm_cli-1.1.0.dev3 → ssm_cli-1.1.0.dev5}/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,6 +210,7 @@ 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)
@@ -230,12 +232,52 @@ class PortForwardingManagerProcess(multiprocessing.Process):
         for logger_name, level in CONFIG.log.loggers.items():
             set_log_level(level, name=logger_name)
         
+
         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_parent()
+        except Exception as e:
+            logger.error(f"failed to detatch from parent: {e}")
+
+        # cleanup handlers
+        import atexit
+        self.cleanup_called = False
+        atexit.register(self.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.cleanup()
+    
+    def cleanup(self):
+        """ Any cleanup tasks go here """
+        # ensure clean up only called once
+        if self.cleanup_called:
+            return
+        self.cleanup_called = True
+
+        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
@@ -249,9 +291,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:
@@ -274,6 +319,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:
@@ -284,6 +335,36 @@ class PortForwardingManagerProcess(multiprocessing.Process):
                     self.sessions.remove(session)
                     break
         return False
+    
+    def detatch_from_parent(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.dev3 → ssm_cli-1.1.0.dev5}/ssm_cli/ssh_proxy/server.py

@@ -44,7 +44,8 @@ class SshServer(paramiko.ServerInterface):
 
         self.port_forwarding_manager.start()
         self.transport.start_server(server=self)
-
+        
+        logger.info("Handshake complete, entering main loop")
         self.event.wait()
 
     # Auth handlers, just allow anything. The only use of this code is ProxyCommand and auth is not needed

{ssm_cli-1.1.0.dev3 → ssm_cli-1.1.0.dev5/ssm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssm-cli
-Version: 1.1.0.dev3
+Version: 1.1.0.dev5
 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.dev3 → ssm_cli-1.1.0.dev5}/ssm_cli.egg-info/requires.txt

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