diff --git a/kippo/core/output.py b/kippo/core/output.py index 1f1dad06..3218be3c 100644 --- a/kippo/core/output.py +++ b/kippo/core/output.py @@ -81,17 +81,17 @@ class Output(object): self.emit(ev) @abc.abstractmethod - def start(): + def start(self): """Abstract method to initialize output plugin""" pass @abc.abstractmethod - def stop(): + def stop(self): """Abstract method to shut down output plugin""" pass @abc.abstractmethod - def handleLog( self, session, event ): + def handleLog(self, session, event): """Handle a general event within the output plugin""" pass @@ -147,7 +147,7 @@ class Output(object): self.ips[sessionno] = ev['src_ip'] del ev['system'] - self.handleLog( self.sessions[sessionno], ev ) + self.handleLog(self.sessions[sessionno], ev) # disconnect is special, remove cached data if ev['eventid'] == 'KIPP0011': diff --git a/kippo/core/ssh.py b/kippo/core/ssh.py index 26341a93..3b33a968 100644 --- a/kippo/core/ssh.py +++ b/kippo/core/ssh.py @@ -49,7 +49,6 @@ class HoneyPotSSHUserAuthServer(userauth.SSHUserAuthServer): return if not data or not len(data.strip()): return - data = '\r\n'.join(data.splitlines() ) self.transport.sendPacket( userauth.MSG_USERAUTH_BANNER, NS(data) + NS('en')) self.bannerSent = True