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

{ssm_cli-1.1.0.dev4/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.dev4
+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

{ssm_cli-1.1.0.dev4 → 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.dev4 → 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.dev4 → ssm_cli-1.1.0.dev5}/ssm_cli/ssh_proxy/forwarding.py

@@ -244,14 +244,14 @@ class PortForwardingManagerProcess(multiprocessing.Process):
 
         # detaching from parent
         try:
-            self.detatch_from_proxy()
+            self.detatch_from_parent()
         except Exception as e:
-            logger.error(f"failed to detatch from proxy: {e}")
+            logger.error(f"failed to detatch from parent: {e}")
 
         # cleanup handlers
         import atexit
         self.cleanup_called = False
-        atexit.register(self.safe_cleanup)
+        atexit.register(self.cleanup)
 
         self.sessions = []
         self.pipe.send("ready")
@@ -263,17 +263,15 @@ class PortForwardingManagerProcess(multiprocessing.Process):
                 logger.info("proxy pipe closed, exiting manager process")
                 break
         
-        self.safe_cleanup()
+        self.cleanup()
     
-    def safe_cleanup(self):
-        """ Used to ensure cleanup only called once """
+    def cleanup(self):
+        """ Any cleanup tasks go here """
+        # ensure clean up 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()
 
@@ -338,7 +336,7 @@ class PortForwardingManagerProcess(multiprocessing.Process):
                     break
         return False
     
-    def detatch_from_proxy(self):
+    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()

{ssm_cli-1.1.0.dev4 → 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.dev4 → 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.dev4
+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