From 5f7b6f3d2d23c35ab7e9e87cac83e63b688acea2 Mon Sep 17 00:00:00 2001 From: Michel Oosterhof Date: Wed, 7 Jun 2017 12:19:13 +0400 Subject: [PATCH] stop symlinking downloads to friendly filenames --- cowrie/commands/curl.py | 2 +- cowrie/commands/ftpget.py | 2 +- cowrie/commands/scp.py | 2 +- cowrie/commands/tftp.py | 2 +- cowrie/commands/wget.py | 2 +- cowrie/core/artifact.py | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cowrie/commands/curl.py b/cowrie/commands/curl.py index 278f5c7a..6f853491 100644 --- a/cowrie/commands/curl.py +++ b/cowrie/commands/curl.py @@ -332,7 +332,7 @@ Options: (H) means HTTP/HTTPS only, (F) means FTP only shasum=shasum) # Link friendly name to hash - os.symlink(shasum, self.safeoutfile) + # os.symlink(shasum, self.safeoutfile) # FIXME: is this necessary? # self.safeoutfile = hashPath diff --git a/cowrie/commands/ftpget.py b/cowrie/commands/ftpget.py index 5cf94baf..bb77eafb 100644 --- a/cowrie/commands/ftpget.py +++ b/cowrie/commands/ftpget.py @@ -131,7 +131,7 @@ Download a file via FTP shasum=shasum) # Link friendly name to hash - os.symlink(shasum, self.safeoutfile) + # os.symlink(shasum, self.safeoutfile) self.safeoutfile = None diff --git a/cowrie/commands/scp.py b/cowrie/commands/scp.py index 2931cf87..cbf05833 100644 --- a/cowrie/commands/scp.py +++ b/cowrie/commands/scp.py @@ -141,7 +141,7 @@ class command_scp(HoneyPotCommand): shasum=shasum) # Link friendly name to hash - os.symlink(hash_path, self.safeoutfile) + # os.symlink(hash_path, self.safeoutfile) self.safeoutfile = None diff --git a/cowrie/commands/tftp.py b/cowrie/commands/tftp.py index 66931f33..70c70962 100644 --- a/cowrie/commands/tftp.py +++ b/cowrie/commands/tftp.py @@ -106,7 +106,7 @@ class command_tftp(HoneyPotCommand): shasum=shasum) # Link friendly name to hash - os.symlink(shasum, self.safeoutfile) + # os.symlink(shasum, self.safeoutfile) self.safeoutfile = None diff --git a/cowrie/commands/wget.py b/cowrie/commands/wget.py index 4d7a054f..b483ed4f 100644 --- a/cowrie/commands/wget.py +++ b/cowrie/commands/wget.py @@ -210,7 +210,7 @@ class command_wget(HoneyPotCommand): shasum=shasum) # Link friendly name to hash - os.symlink(shasum, self.safeoutfile) + # os.symlink(shasum, self.safeoutfile) self.safeoutfile = None diff --git a/cowrie/core/artifact.py b/cowrie/core/artifact.py index bfaf44d5..ee37f42d 100644 --- a/cowrie/core/artifact.py +++ b/cowrie/core/artifact.py @@ -82,11 +82,11 @@ class Artifact: else: os.rename(self.fp.name, shasumFilename) - if size>0: - linkName = self.artifactDir + "/" \ - + time.strftime('%Y%m%dT%H%M%S') \ - + "_" + re.sub('[^-A-Za-z0-9]', '_', self.label) - os.symlink(shasum, linkName) + # if size>0: + # linkName = self.artifactDir + "/" \ + # + time.strftime('%Y%m%dT%H%M%S') \ + # + "_" + re.sub('[^-A-Za-z0-9]', '_', self.label) + # os.symlink(shasum, linkName) return shasum, shasumFilename