change exec handling so the command is allowed to run long enough for wget to

work

kippo/core/exceptions.py

@@ -0,0 +1,3 @@
+class NotEnabledException(Exception):
+    """ Feature not enabled
+    """

kippo/core/honeypot.py

@@ -16,6 +16,8 @@ import sys, os, random, pickle, time, stat, shlex, anydbm, struct
 from kippo.core import ttylog, fs, utils
 from kippo.core.userdb import UserDB
 from kippo.core.config import config
+from kippo.core import exceptions
+
 import commands
 
 import ConfigParser
@@ -84,8 +86,12 @@ class HoneyPotShell(object):
                 self.showPrompt()
 
         if not len(self.cmdpending):
+            if self.interactive:
                 self.showPrompt()
+            else:
+                self.honeypot.terminal.transport.loseConnection()
             return
+
         line = self.cmdpending.pop(0)
         try:
             cmdAndArgs = shlex.split(line)
@@ -139,7 +145,7 @@ class HoneyPotShell(object):
         self.runCommand()
 
     def showPrompt(self):
-        if (self.honeypot.execcmd != None):
+        if not self.interactive:
             return
         # Example: srv03:~#
         #prompt = '%s:%%(path)s' % self.honeypot.hostname
@@ -248,10 +254,9 @@ class HoneyPotShell(object):
         self.honeypot.terminal.write(newbuf)
 
 class HoneyPotBaseProtocol(insults.TerminalProtocol):
-    def __init__(self, user, env, execcmd = None):
+    def __init__(self, user, env):
         self.user = user
         self.env = env
-        self.execcmd = execcmd
         self.hostname = self.env.cfg.get('honeypot', 'hostname')
         self.fs = fs.HoneyPotFilesystem(deepcopy(self.env.fs))
         if self.fs.exists(user.home):
@@ -335,9 +340,6 @@ class HoneyPotBaseProtocol(insults.TerminalProtocol):
         return None
 
     def lineReceived(self, line):
-        # Don't execute additional commands after execcmd
-        if self.execcmd != None:
-            return
         if len(self.cmdstack):
             self.cmdstack[-1].lineReceived(line)
 
@@ -367,9 +369,9 @@ class HoneyPotBaseProtocol(insults.TerminalProtocol):
 
 class HoneyPotInteractiveProtocol(HoneyPotBaseProtocol, recvline.HistoricRecvLine):
 
-    def __init__(self, user, env, execcmd = None):
+    def __init__(self, user, env):
         recvline.HistoricRecvLine.__init__(self)
-        HoneyPotBaseProtocol.__init__(self, user, env, execcmd)
+        HoneyPotBaseProtocol.__init__(self, user, env)
 
     def connectionMade(self):
         HoneyPotBaseProtocol.connectionMade(self)
@@ -380,17 +382,6 @@ class HoneyPotInteractiveProtocol(HoneyPotBaseProtocol, recvline.HistoricRecvLin
         transport = self.terminal.transport.session.conn.transport
         transport.factory.sessions[transport.transport.sessionno] = self
 
-        if self.execcmd != None:
-            print 'Running exec cmd "%s"' % self.execcmd
-            self.cmdstack[0].lineReceived(self.execcmd)
-            self.terminal.transport.session.conn.sendRequest(
-                self.terminal.transport.session,
-                'exit-status',
-                struct.pack('>L', 0))
-            self.terminal.transport.session.conn.sendClose(
-                self.terminal.transport.session)
-            return
-
         self.keyHandlers.update({
             '\x04':     self.handle_CTRL_D,
             '\x15':     self.handle_CTRL_U,
@@ -454,6 +445,10 @@ class HoneyPotInteractiveProtocol(HoneyPotBaseProtocol, recvline.HistoricRecvLin
 
 class HoneyPotExecProtocol(HoneyPotBaseProtocol):
 
+    def __init__(self, user, env, execcmd):
+        self.execcmd = execcmd
+        HoneyPotBaseProtocol.__init__(self, user, env)
+
     def connectionMade(self):
         HoneyPotBaseProtocol.connectionMade(self)
 
@@ -461,12 +456,6 @@ class HoneyPotExecProtocol(HoneyPotBaseProtocol):
 
         print 'Running exec command "%s"' % self.execcmd
         self.cmdstack[0].lineReceived(self.execcmd)
-        self.terminal.transport.session.conn.sendRequest(
-            self.terminal.transport.session,
-            'exit-status',
-            struct.pack('>L', 0))
-        self.terminal.transport.session.conn.sendClose(
-            self.terminal.transport.session)
 
 class LoggingServerProtocol(insults.ServerProtocol):
     def connectionMade(self):
@@ -531,10 +520,13 @@ class HoneyPotAvatar(avatar.ConchUser):
 
     def execCommand(self, protocol, cmd):
         cfg = config()
-        if cfg.has_option('honeypot', 'exec_enabled'):
-            if ( cfg.get('honeypot', 'exec_enabled') != "true" ):
-                print 'exec disabled. Not executing command: "%s"' % cmd
-                raise os.OSError
+        if not cfg.has_option('honeypot', 'exec_enabled') or \
+                cfg.get('honeypot', 'exec_enabled').lower() not in \
+                    ('yes', 'true', 'on'):
+            print 'Exec disabled. Not executing command: "%s"' % cmd
+            raise exceptions.NotEnabledException, \
+                'exce_enabled not enabled in configuration file!'
+            return
 
         print 'exec command: "%s"' % cmd
         serverProtocol = LoggingServerProtocol(