Workaround for missing log entries by adding a direct method to communicating

with the dbloggers, thus avoiding twisted context/scope problems


git-svn-id: https://kippo.googlecode.com/svn/trunk@199 951d7100-d841-11de-b865-b3884708a8e2

kippo/core/dblog.py

@@ -12,6 +12,10 @@ class DBLogger(object):
             '^New connection: ([0-9.]+):([0-9]+) \(([0-9.]+):([0-9]+)\) ' + \
             '\[session: ([0-9]+)\]$')
         self.re_sessionlog = re.compile('.*HoneyPotTransport,([0-9]+),[0-9.]+$')
+
+        # :dispatch: means the message has been delivered directly via
+        # logDispatch, instead of relying on the twisted logging, which breaks
+        # on scope changes.
         self.re_map = [(re.compile(x[0]), x[1]) for x in (
             ('^connection lost$',
                 self._connectionLost),
@@ -21,9 +25,9 @@ class DBLogger(object):
                 self.handleLoginSucceeded),
             ('^Opening TTY log: (?P<logfile>.*)$',
                 self.handleTTYLogOpened),
-            ('^Command found: (?P<input>.*)$',
+            ('^:dispatch: Command found: (?P<input>.*)$',
                 self.handleCommand),
-            ('^Command not found: (?P<input>.*)$',
+            ('^:dispatch: Command not found: (?P<input>.*)$',
                 self.handleUnknownCommand),
             ('^INPUT \((?P<realm>[a-zA-Z0-9]+)\): (?P<input>.*)$',
                 self.handleInput),
@@ -34,6 +38,15 @@ class DBLogger(object):
             )]
         self.start(cfg)
 
+    def logDispatch(self, sessionid, msg):
+        if sessionid not in self.sessions.keys():
+            return
+        for regex, func in self.re_map:
+            match = regex.match(msg)
+            if match:
+                func(self.sessions[sessionid], match.groupdict())
+                break
+
     def start():
         pass
 

kippo/core/honeypot.py

@@ -122,8 +122,10 @@ class HoneyPotShell(object):
         cmdclass = self.honeypot.getCommand(cmd, envvars['PATH'].split(':'))
         if cmdclass:
             print 'Command found: %s' % (line,)
+            self.honeypot.logDispatch('Command found: %s' % (line,))
             self.honeypot.call_command(cmdclass, *rargs)
         else:
+            self.honeypot.logDispatch('Command not found: %s' % (line,))
             print 'Command not found: %s' % (line,)
             if len(line):
                 self.honeypot.writeln('bash: %s: command not found' % cmd)
@@ -241,19 +243,25 @@ class HoneyPotProtocol(recvline.HistoricRecvLine):
         self.password_input = False
         self.cmdstack = []
 
+    def logDispatch(self, msg):
+        transport = self.terminal.transport.session.conn.transport
+        msg = ':dispatch: ' + msg
+        transport.factory.logDispatch(transport.transport.sessionno, msg)
+
     def connectionMade(self):
         recvline.HistoricRecvLine.connectionMade(self)
         self.displayMOTD()
         self.cmdstack = [HoneyPotShell(self)]
 
+        transport = self.terminal.transport.session.conn.transport
+
         # You are in a maze of twisty little passages, all alike
-        p = self.terminal.transport.session.conn.transport.transport.getPeer()
+        p = transport.transport.getPeer()
 
         # real source IP of client
         self.realClientIP = p.host
 
-        self.clientVersion = \
+        self.clientVersion = transport.otherVersionString
-            self.terminal.transport.session.conn.transport.otherVersionString
 
         # source IP of client in user visible reports (can be fake or real)
         cfg = config()
@@ -492,6 +500,11 @@ class HoneyPotSSHFactory(factory.SSHFactory):
         'ssh-connection': connection.SSHConnection,
         }
 
+    # Special delivery to the loggers to avoid scope problems
+    def logDispatch(self, sessionid, msg):
+        for dblog in self.dbloggers:
+            dblog.logDispatch(sessionid, msg)
+
     def __init__(self):
         cfg = config()
 
@@ -512,6 +525,7 @@ class HoneyPotSSHFactory(factory.SSHFactory):
                 print 'pass.db backed up to %s.bak' % (passdb_file,)
 
         # load db loggers
+        self.dbloggers = []
         for x in cfg.sections():
             if not x.startswith('database_'):
                 continue
@@ -526,6 +540,7 @@ class HoneyPotSSHFactory(factory.SSHFactory):
                 'kippo.dblog.%s' % (engine,),
                 globals(), locals(), ['dblog']).DBLogger(lcfg)
             log.startLoggingWithObserver(dblogger.emit, setStdout=False)
+            self.dbloggers.append(dblogger)
 
     def buildProtocol(self, addr):
         # FIXME: try to mimic something real 100%