stop symlinking downloads to friendly filenames

This commit is contained in:
Michel Oosterhof 2017-06-07 12:19:13 +04:00
parent dfb909eae6
commit 5f7b6f3d2d
6 changed files with 10 additions and 10 deletions

View File

@ -332,7 +332,7 @@ Options: (H) means HTTP/HTTPS only, (F) means FTP only
shasum=shasum) shasum=shasum)
# Link friendly name to hash # Link friendly name to hash
os.symlink(shasum, self.safeoutfile) # os.symlink(shasum, self.safeoutfile)
# FIXME: is this necessary? # FIXME: is this necessary?
# self.safeoutfile = hashPath # self.safeoutfile = hashPath

View File

@ -131,7 +131,7 @@ Download a file via FTP
shasum=shasum) shasum=shasum)
# Link friendly name to hash # Link friendly name to hash
os.symlink(shasum, self.safeoutfile) # os.symlink(shasum, self.safeoutfile)
self.safeoutfile = None self.safeoutfile = None

View File

@ -141,7 +141,7 @@ class command_scp(HoneyPotCommand):
shasum=shasum) shasum=shasum)
# Link friendly name to hash # Link friendly name to hash
os.symlink(hash_path, self.safeoutfile) # os.symlink(hash_path, self.safeoutfile)
self.safeoutfile = None self.safeoutfile = None

View File

@ -106,7 +106,7 @@ class command_tftp(HoneyPotCommand):
shasum=shasum) shasum=shasum)
# Link friendly name to hash # Link friendly name to hash
os.symlink(shasum, self.safeoutfile) # os.symlink(shasum, self.safeoutfile)
self.safeoutfile = None self.safeoutfile = None

View File

@ -210,7 +210,7 @@ class command_wget(HoneyPotCommand):
shasum=shasum) shasum=shasum)
# Link friendly name to hash # Link friendly name to hash
os.symlink(shasum, self.safeoutfile) # os.symlink(shasum, self.safeoutfile)
self.safeoutfile = None self.safeoutfile = None

View File

@ -82,11 +82,11 @@ class Artifact:
else: else:
os.rename(self.fp.name, shasumFilename) os.rename(self.fp.name, shasumFilename)
if size>0: # if size>0:
linkName = self.artifactDir + "/" \ # linkName = self.artifactDir + "/" \
+ time.strftime('%Y%m%dT%H%M%S') \ # + time.strftime('%Y%m%dT%H%M%S') \
+ "_" + re.sub('[^-A-Za-z0-9]', '_', self.label) # + "_" + re.sub('[^-A-Za-z0-9]', '_', self.label)
os.symlink(shasum, linkName) # os.symlink(shasum, linkName)
return shasum, shasumFilename return shasum, shasumFilename