close transport properly after SessionCloseError

mb_netmgmt/__init__.py

@@ -18,7 +18,7 @@
 # along with mb-netmgmt. If not, see <https://www.gnu.org/licenses/
 
 """Network Management Protocols for Mountebank"""
-__version__ = "0.0.38"
+__version__ = "0.0.39"
 
 import os
 import subprocess

mb_netmgmt/netconf.py

@@ -36,7 +36,7 @@
 from ncclient.transport.ssh import MSG_DELIM, PORT_NETCONF_DEFAULT, SSHSession
 
 from mb_netmgmt.__main__ import Protocol
-from mb_netmgmt.ssh import accept
+from mb_netmgmt.ssh import start_server
 
 stopped = False
 
@@ -50,10 +50,12 @@ def setup(self):
 
     def handle(self):
         self.callback_url = self.server.callback_url
-        self.channel = accept(self.request)
+        transport = start_server(self.request)
+        self.channel = transport.accept()
         self.open_upstream()
         self.session._connected = True
         self.handle_prompt()
+        self.session._transport = transport
         self.session._channel = self.channel
         self.session.run()
 

mb_netmgmt/ssh.py

@@ -56,7 +56,8 @@ class Handler(BaseRequestHandler, Protocol):
 
     def handle(self):
         self.callback_url = self.server.callback_url
-        self.channel = accept(self.request)
+        transport = start_server(self.request)
+        self.channel = transport.accept()
         self.open_upstream()
         self.handle_prompt()
         while not stopped:
@@ -103,10 +104,10 @@ def read_message(self, channel):
         return message
 
 
-def accept(request):
+def start_server(request):
     t = paramiko.Transport(request)
     t.add_server_key(paramiko.DSSKey.generate())
     t.add_server_key(paramiko.ECDSAKey.generate())
     t.add_server_key(paramiko.RSAKey.generate(4096))
     t.start_server(server=ParamikoServer())
-    return t.accept()
+    return t