sftp client is created only on sftp subsystem request

manfred-kaiser · manfred-kaiser · commit ebf4ea860b1d · 2021-05-03T11:43:24.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.0] - 2021-03-26
+
+## Changed
+
+- sftp client is created only on sftp subsystem request
+
+
 ## [0.5.0] - 2021-03-26
 
 ## Added
@@ -47,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - fixed pseudo terminal on exec command
 
+[0.5.0]: https://github.com/ssh-mitm/ssh-mitm/compare/0.5.0...0.5.1
 [0.5.0]: https://github.com/ssh-mitm/ssh-mitm/compare/0.4.3...0.5.0
 [0.4.3]: https://github.com/ssh-mitm/ssh-mitm/compare/0.4.2...0.4.3
 [0.4.2]: https://github.com/ssh-mitm/ssh-mitm/compare/0.4.1...0.4.2
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def get_entry_points():
 
 setup(
     name='ssh-mitm',
-    version='0.5.0',
+    version='0.5.1',
     author='SSH-MITM Dev-Team',
     author_email='support@ssh-mitm.at',
     description='ssh mitm server for security audits supporting public key authentication, session hijacking and file manipulation',
diff --git a/ssh_proxy_server/authentication.py b/ssh_proxy_server/authentication.py
@@ -5,7 +5,6 @@
 from sshpubkeys import SSHKey
 
 from ssh_proxy_server.clients.ssh import SSHClient, AuthenticationMethod
-from ssh_proxy_server.clients.sftp import SFTPClient
 from ssh_proxy_server.exceptions import MissingHostException
 
 
@@ -162,7 +161,6 @@ def get_agent_pubkeys():
         )
         if sshclient.connect():
             self.session.ssh_client = sshclient
-            self.session.sftp_client = SFTPClient.from_client(sshclient)
             return paramiko.AUTH_SUCCESSFUL
         logging.warning('connection failed!')
         return paramiko.AUTH_FAILED
diff --git a/ssh_proxy_server/interfaces/server.py b/ssh_proxy_server/interfaces/server.py
@@ -4,6 +4,7 @@
 from sshpubkeys import SSHKey
 
 from enhancements.modules import BaseModule
+from ssh_proxy_server.clients.sftp import SFTPClient
 
 
 class BaseServerInterface(paramiko.ServerInterface, BaseModule):
@@ -240,7 +241,7 @@ def check_global_request(self, msg):
 
 class ProxySFTPServer(paramiko.SFTPServer):
     def start_subsystem(self, name, transport, channel):
-        self.server.session.sftp_client_ready.wait()
+        self.server.session.sftp_client = SFTPClient.from_client(self.server.session.ssh_client)
         self.server.session.sftp_client.subsystem_count += 1
         super().start_subsystem(name, transport, channel)
 
