Rooba
/
cowrie
mirror of https://github.com/cowrie/cowrie.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Report actual path in redir event (#520)

This commit is contained in:
fe7ch 2017-06-03 10:10:12 +03:00 committed by Michel Oosterhof
parent e13286a768
commit e81fa0284b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cowrie/core/protocol.py
View File

@ -204,7 +204,10 @@ class HoneyPotBaseProtocol(insults.TerminalProtocol, TimeoutMixin):
obj.start()
if hasattr(obj, 'safeoutfile'):
if obj.safeoutfile:
self.terminal.redirFiles.add(obj.safeoutfile)
if hasattr(obj, 'outfile'):
self.terminal.redirFiles.add((obj.safeoutfile, obj.outfile))
else:
self.terminal.redirFiles.add((obj.safeoutfile, ''))
if self.pp:
self.pp.outConnectionLost()

13
cowrie/insults/insults.py
View File

@ -22,6 +22,7 @@ class LoggingServerProtocol(insults.ServerProtocol):
"""
stdinlogOpen = False
ttylogOpen = False
redirlogOpen = False # it will be set at core/protocol.py
def __init__(self, prot=None, *a, **kw):
insults.ServerProtocol.__init__(self, prot, *a, **kw)
@ -163,7 +164,15 @@ class LoggingServerProtocol(insults.ServerProtocol):
self.stdinlogOpen = False
if self.redirFiles:
for rf in self.redirFiles:
for rp in self.redirFiles:
rf = rp[0]
if rp[1]:
url = rp[1]
else:
url = rf[rf.find('redir_')+len('redir_'):]
try:
if not os.path.exists(rf):
continue
@ -183,7 +192,7 @@ class LoggingServerProtocol(insults.ServerProtocol):
os.symlink(shasum, rf)
log.msg(eventid='cowrie.session.file_download',
format='Saved redir contents with SHA-256 %(shasum)s to %(outfile)s',
url='redir',
url=url,
outfile=shasumfile,
shasum=shasum)
except IOError: