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/1053/head
ibuler 2018-03-07 22:15:06 +08:00
parent 629ff39026 51d7e51119
commit 4e0f81e447
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/terminal/api.py
View File

@ -4,12 +4,15 @@ from collections import OrderedDict
import logging import logging
import os import os
import uuid import uuid
import boto3 # AWS S3 sdk
from django.core.cache import cache from django.core.cache import cache
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
from django.utils import timezone from django.utils import timezone
from django.core.files.storage import default_storage from django.core.files.storage import default_storage
from django.http import HttpResponseNotFound from django.http import HttpResponseNotFound
from django.conf import settings
from rest_framework import viewsets, serializers from rest_framework import viewsets, serializers
from rest_framework.views import APIView, Response from rest_framework.views import APIView, Response
from rest_framework.permissions import AllowAny from rest_framework.permissions import AllowAny
@ -23,7 +26,6 @@ from .hands import IsSuperUserOrAppUser, IsAppUser, \
IsSuperUserOrAppUserOrUserReadonly IsSuperUserOrAppUserOrUserReadonly
from .backends import get_command_store, get_multi_command_store, \ from .backends import get_command_store, get_multi_command_store, \
SessionCommandSerializer SessionCommandSerializer
import boto3 # AWS S3 sdk
logger = logging.getLogger(__file__) logger = logging.getLogger(__file__)
@ -280,11 +282,11 @@ class SessionReplayViewSet(viewsets.ViewSet):
url = default_storage.url(path) url = default_storage.url(path)
return redirect(url) return redirect(url)
else: else:
config = self.app.config.get("REPLAY_STORAGE", None) config = settings.TERMINAL_REPLAY_STORAGE.items()
if config: if config:
for name in config.keys(): for name, value in config:
if config[name].get("TYPE", '') == "s3": if value.get("TYPE", '') == "s3":
client, bucket = self.s3Client(config[name]) client, bucket = self.s3Client(value)
try: try:
client.head_object(Bucket=bucket, Key=path) client.head_object(Bucket=bucket, Key=path)
client.download_file(bucket, path, default_storage.base_location + '/' + path) client.download_file(bucket, path, default_storage.base_location + '/' + path)
@ -298,7 +300,7 @@ class SessionReplayViewSet(viewsets.ViewSet):
REGION = config.get("REGION", None) REGION = config.get("REGION", None)
ACCESS_KEY = config.get("ACCESS_KEY", None) ACCESS_KEY = config.get("ACCESS_KEY", None)
SECRET_KEY = config.get("SECRET_KEY", None) SECRET_KEY = config.get("SECRET_KEY", None)
if self.ACCESS_KEY and REGION and SECRET_KEY: if ACCESS_KEY and REGION and SECRET_KEY:
s3 = boto3.client('s3', s3 = boto3.client('s3',
region_name=REGION, region_name=REGION,
aws_access_key_id=ACCESS_KEY, aws_access_key_id=ACCESS_KEY,