aljaz/cowrie
1
0
Fork 0
mirror of https://github.com/aljazceru/cowrie.git synced 2026-01-31 12:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct TftpClient initialization, close file handle on exception (#458)

Browse Source
This commit is contained in:
fe7ch
2017-02-18 18:28:03 +03:00
committed by Michel Oosterhof
parent a27662efa0
commit 2f2d458fee
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cowrie/commands/tftp.py
View File

@@ -62,17 +62,20 @@ class command_tftp(HoneyPotCommand):
re.sub('[^A-Za-z0-9]', '_', self.file_to_get))
self.safeoutfile = os.path.join(self.download_path, tmp_fname)
with tftpy.TftpClient(self.hostname, int(self.port)) as tclient:
try:
tclient.download(self.file_to_get, self.safeoutfile, progresshook)
self.file_to_get = self.fs.resolve_path(self.file_to_get, self.protocol.cwd)
if hasattr(tclient.context, 'metrics'):
self.fs.mkfile(self.file_to_get, 0, 0, tclient.context.metrics.bytes, 33188)
else:
self.fs.mkfile(self.file_to_get, 0, 0, 0, 33188)
self.fs.update_realfile(self.fs.getfile(self.file_to_get), self.safeoutfile)
except tftpy.TftpException, err:
pass
tclient = None
try:
tclient = tftpy.TftpClient(self.hostname, int(self.port))
tclient.download(self.file_to_get, self.safeoutfile, progresshook)
self.file_to_get = self.fs.resolve_path(self.file_to_get, self.protocol.cwd)
if hasattr(tclient.context, 'metrics'):
self.fs.mkfile(self.file_to_get, 0, 0, tclient.context.metrics.bytes, 33188)
else:
self.fs.mkfile(self.file_to_get, 0, 0, 0, 33188)
self.fs.update_realfile(self.fs.getfile(self.file_to_get), self.safeoutfile)
except tftpy.TftpException, err:
if tclient and tclient.context and not tclient.context.fileobj.closed:
tclient.context.fileobj.close()
if os.path.exists(self.safeoutfile):