github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/1055/head
ibuler 2018-03-07 23:29:17 +08:00
parent 60427b9908 580f1f2a82
commit 51e15b583f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/terminal/api.py
View File

@ -288,8 +288,12 @@ class SessionReplayViewSet(viewsets.ViewSet):
if value.get("TYPE", '') == "s3":
client, bucket = self.s3Client(value)
try:
client.head_object(Bucket=bucket, Key=path)
client.download_file(bucket, path, default_storage.base_location + '/' + path)
date = self.session.date_start.strftime('%Y-%m-%d')
client.head_object(Bucket=bucket,
Key=os.path.join(date, str(self.session.id) + '.replay.gz'))
client.download_file(bucket, os.path.join(date, str(self.session.id) + '.replay.gz'),
default_storage.base_location + '/' + path)
return redirect(default_storage.url(path))
except:
pass