correct newlines onissue file. also doesn't need ^M.

This commit is contained in:
Michel Oosterhof 2015-03-10 14:10:08 +00:00
parent dfae11047a
commit 613e277832
2 changed files with 4 additions and 5 deletions

View File

@ -81,17 +81,17 @@ class Output(object):
self.emit(ev) self.emit(ev)
@abc.abstractmethod @abc.abstractmethod
def start(): def start(self):
"""Abstract method to initialize output plugin""" """Abstract method to initialize output plugin"""
pass pass
@abc.abstractmethod @abc.abstractmethod
def stop(): def stop(self):
"""Abstract method to shut down output plugin""" """Abstract method to shut down output plugin"""
pass pass
@abc.abstractmethod @abc.abstractmethod
def handleLog( self, session, event ): def handleLog(self, session, event):
"""Handle a general event within the output plugin""" """Handle a general event within the output plugin"""
pass pass
@ -147,7 +147,7 @@ class Output(object):
self.ips[sessionno] = ev['src_ip'] self.ips[sessionno] = ev['src_ip']
del ev['system'] del ev['system']
self.handleLog( self.sessions[sessionno], ev ) self.handleLog(self.sessions[sessionno], ev)
# disconnect is special, remove cached data # disconnect is special, remove cached data
if ev['eventid'] == 'KIPP0011': if ev['eventid'] == 'KIPP0011':

View File

@ -49,7 +49,6 @@ class HoneyPotSSHUserAuthServer(userauth.SSHUserAuthServer):
return return
if not data or not len(data.strip()): if not data or not len(data.strip()):
return return
data = '\r\n'.join(data.splitlines() )
self.transport.sendPacket( self.transport.sendPacket(
userauth.MSG_USERAUTH_BANNER, NS(data) + NS('en')) userauth.MSG_USERAUTH_BANNER, NS(data) + NS('en'))
self.bannerSent = True self.bannerSent = True