cowrie/cowrie
1
0
Fork 0
mirror of https://github.com/cowrie/cowrie.git synced 2025-07-01 18:07:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly state protocol in hpfeeds event (#608)

Browse Source
This commit is contained in:
Jc2k
2017-11-03 10:48:39 +00:00
committed by Michel Oosterhof
parent 6af4ede785
commit 34a8359469
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cowrie/output/hpfeeds.py
View File

@ -291,7 +291,7 @@ class Output(cowrie.core.output.Output):
'hostIP': entry["dst_ip"], 'hostPort': entry["dst_port"], 'hostIP': entry["dst_ip"], 'hostPort': entry["dst_port"],
'loggedin': None, 'credentials':[], 'commands':[], 'loggedin': None, 'credentials':[], 'commands':[],
'unknownCommands':[], 'urls':[], 'version': None, 'unknownCommands':[], 'urls':[], 'version': None,
'ttylog': None, 'hashes': set()} 'ttylog': None, 'hashes': set(), 'protocol': entry['protocol']}
elif entry["eventid"] == 'cowrie.login.success': elif entry["eventid"] == 'cowrie.login.success':
u, p = entry['username'], entry['password'] u, p = entry['username'], entry['password']

2
cowrie/ssh/transport.py
View File

@ -41,7 +41,7 @@ class HoneyPotSSHTransport(transport.SSHServerTransport, TimeoutMixin):
format='New connection: %(src_ip)s:%(src_port)s (%(dst_ip)s:%(dst_port)s) [session: %(session)s]', format='New connection: %(src_ip)s:%(src_port)s (%(dst_ip)s:%(dst_port)s) [session: %(session)s]',
src_ip=src_ip, src_port=self.transport.getPeer().port, src_ip=src_ip, src_port=self.transport.getPeer().port,
dst_ip=self.transport.getHost().host, dst_port=self.transport.getHost().port, dst_ip=self.transport.getHost().host, dst_port=self.transport.getHost().port,
session=self.transportId, sessionno='S'+str(self.transport.sessionno)) session=self.transportId, sessionno='S'+str(self.transport.sessionno), protocol='ssh')
self.transport.write('{}\r\n'.format(self.ourVersionString)) self.transport.write('{}\r\n'.format(self.ourVersionString))
self.currentEncryptions = transport.SSHCiphers('none', 'none', 'none', 'none') self.currentEncryptions = transport.SSHCiphers('none', 'none', 'none', 'none')

2
cowrie/telnet/transport.py
View File

@ -215,7 +215,7 @@ class CowrieTelnetTransport(TelnetTransport, TimeoutMixin):
format='New connection: %(src_ip)s:%(src_port)s (%(dst_ip)s:%(dst_port)s) [session: T%(sessionno)s]', format='New connection: %(src_ip)s:%(src_port)s (%(dst_ip)s:%(dst_port)s) [session: T%(sessionno)s]',
src_ip=self.transport.getPeer().host, src_port=self.transport.getPeer().port, src_ip=self.transport.getPeer().host, src_port=self.transport.getPeer().port,
dst_ip=self.transport.getHost().host, dst_port=self.transport.getHost().port, dst_ip=self.transport.getHost().host, dst_port=self.transport.getHost().port,
session=self.transportId, sessionno='T'+str(sessionno)) session=self.transportId, sessionno='T'+str(sessionno), protocol='telnet')
TelnetTransport.connectionMade(self) TelnetTransport.connectionMade(self)