Scriptedshell working

Author: The5imon

setup.py

@@ -11,7 +11,7 @@
 
 
 def get_entry_points():
-    from plugins.__entrypoints__ import entry_points as plugins_entry_points
+    from ssh_mitm_plugins.__entrypoints__ import entry_points as plugins_entry_points
     return {
         **plugins_entry_points
     }

ssh_mitm_plugins/__entrypoints__.py

@@ -1,6 +1,6 @@
 entry_points = {
     'SSHBaseForwarder': [
-        'scriptedshell = plugins.ssh.scriptedshell:SSHScriptedForwarder',
+        'scriptedshell = ssh_mitm_plugins.ssh.scriptedshell:SSHScriptedForwarder',
     ],
     'SCPBaseForwarder': [
 
@@ -10,14 +10,5 @@
     ],
     'SFTPHandlerBasePlugin': [
 
-    ],
-    'BaseServerInterface': [
-
-    ],
-    'BaseSSHProxyManager': [
-
-    ],
-    'Authenticator': [
-
     ]
 }

ssh_mitm_plugins/ssh/scriptedshell.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import enhancements.modules
 
 from ssh_proxy_server.forwarders.ssh import SSHForwarder
 
@@ -31,19 +30,21 @@ def __init__(self, session):
     def forward_stdin(self):
         if self.executing:
             line = self.script.readline()
-            self.server_channel.sendall(line)
+            logging.debug(line)
+            if line == "" and not self.server_channel.recv_ready():
+                logging.debug("Script: Shutting down")
+                self.executing = False
+                self.script.close()
+                self.output.close()
+                super(SSHScriptedForwarder, self).forward_stdin()
+            elif line != "":
+                self.server_channel.sendall(line)
             return
-        if not self.executing and not self.script.closed and self.session.ssh_channel.recv_ready():
+        if not self.executing and not self.script.closed and self.server_channel.recv_ready():
+            logging.debug("Script: Starting")
             self.executing = True
         super(SSHScriptedForwarder, self).forward_stdin()
 
-    def forward_stdout(self):
-        if not self.server_channel.recv_ready() and self.executing:
-            self.executing = False
-            self.script.close()
-            self.output.close()
-        super(SSHScriptedForwarder, self).forward_stdout()
-
     def stdout(self, text):
         if self.executing:
             self.output.write(text.decode('utf-8'))