From 0d8a600277fcadefb374a7d23857c522ce2b7a44 Mon Sep 17 00:00:00 2001 From: oldseven Date: Fri, 27 Apr 2018 15:17:32 +0800 Subject: [PATCH 1/7] =?UTF-8?q?#1258=20bug=20fix:=20=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91OSS=E5=BD=95=E5=83=8F=E6=97=A0=E6=B3=95=E5=9B=9E?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index a964e9729..a5f7847ab 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -297,6 +297,10 @@ class SessionReplayViewSet(viewsets.ViewSet): date = self.session.date_start.strftime('%Y-%m-%d') file_path = os.path.join(date, str(self.session.id) + '.replay.gz') target_path = default_storage.base_location + '/' + path + folder_path = default_storage.base_location + date + + if not default_storage.exists(folder_path): + os.mkdir(folder_path) if client and client.has_file(file_path) and \ client.download_file(file_path, target_path): From 4f28f854103dec498440e960575305a29230acac Mon Sep 17 00:00:00 2001 From: oldseven Date: Tue, 29 May 2018 09:51:55 +0800 Subject: [PATCH 2/7] #1368 --- apps/terminal/api.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index fbbae5e22..28d8d6c02 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -4,6 +4,7 @@ from collections import OrderedDict import logging import os import uuid +import copy from django.core.cache import cache from django.shortcuts import get_object_or_404, redirect @@ -291,8 +292,12 @@ class SessionReplayViewSet(viewsets.ViewSet): url = default_storage.url(path) return redirect(url) else: - configs = settings.TERMINAL_REPLAY_STORAGE - configs = [cfg for cfg in configs if cfg['TYPE'] != 'server'] + config = settings.TERMINAL_REPLAY_STORAGE + configs = copy.deepcopy(config) + for cfg in config: + if config[cfg]['TYPE'] == 'server': + configs.__delitem__(cfg) + if not configs: return HttpResponseNotFound() From 7a7c6d40dffdf8ce82c59e1e92af3114a365a523 Mon Sep 17 00:00:00 2001 From: Nevss <85764621@qq.com> Date: Thu, 5 Jul 2018 19:08:35 +0800 Subject: [PATCH 3/7] update docker-guacamole version to latest update docker-guacamole version to latest --- docs/step_by_step.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 484013e1b..300e1a3a2 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -228,7 +228,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \ -e JUMPSERVER_KEY_DIR=/config/guacamole/key \ -e JUMPSERVER_SERVER=http://<填写本机的IP地址>:8080 \ - registry.jumpserver.org/public/guacamole:1.0.0 + registry.jumpserver.org/public/guacamole:latest 这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义一下。 From 0ddb9476ba68f03ea6507af1ebe3535ec202fd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=B3=B0=E4=BB=BB1049851?= Date: Mon, 9 Jul 2018 15:55:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 资产授权页面增加分页 --- apps/perms/api.py | 2 ++ apps/perms/templates/perms/asset_permission_list.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index 33a027064..ece7c1011 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404 from rest_framework.views import APIView, Response from rest_framework.generics import ListAPIView, get_object_or_404, RetrieveUpdateAPIView from rest_framework import viewsets +from rest_framework.pagination import LimitOffsetPagination from common.utils import set_or_append_attr_bulk, get_object_or_none from users.permissions import IsValidUser, IsSuperUser, IsSuperUserOrAppUser @@ -22,6 +23,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): queryset = AssetPermission.objects.all() serializer_class = serializers.AssetPermissionCreateUpdateSerializer permission_classes = (IsSuperUser,) + pagination_class = LimitOffsetPagination def get_serializer_class(self): if self.action in ("list", 'retrieve'): diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index c18f12224..2f0f74312 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -208,7 +208,7 @@ function initTable() { select: {}, op_html: $('#actions').html() }; - table = jumpserver.initDataTable(options); + table = jumpserver.initServerSideDataTable(options); return table } From eaefb5c669bce925062c6fa65bbf96250e0984fa Mon Sep 17 00:00:00 2001 From: ycfuck Date: Mon, 9 Jul 2018 16:00:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?Revert=20"=E8=B5=84=E4=BA=A7=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0ddb9476ba68f03ea6507af1ebe3535ec202fd30. --- apps/perms/api.py | 2 -- apps/perms/templates/perms/asset_permission_list.html | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index ece7c1011..33a027064 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -5,7 +5,6 @@ from django.shortcuts import get_object_or_404 from rest_framework.views import APIView, Response from rest_framework.generics import ListAPIView, get_object_or_404, RetrieveUpdateAPIView from rest_framework import viewsets -from rest_framework.pagination import LimitOffsetPagination from common.utils import set_or_append_attr_bulk, get_object_or_none from users.permissions import IsValidUser, IsSuperUser, IsSuperUserOrAppUser @@ -23,7 +22,6 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): queryset = AssetPermission.objects.all() serializer_class = serializers.AssetPermissionCreateUpdateSerializer permission_classes = (IsSuperUser,) - pagination_class = LimitOffsetPagination def get_serializer_class(self): if self.action in ("list", 'retrieve'): diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index 2f0f74312..c18f12224 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -208,7 +208,7 @@ function initTable() { select: {}, op_html: $('#actions').html() }; - table = jumpserver.initServerSideDataTable(options); + table = jumpserver.initDataTable(options); return table } From 72517a2c724388d0244196e074c34d7e51571564 Mon Sep 17 00:00:00 2001 From: ycfuck Date: Tue, 10 Jul 2018 16:33:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=8E=88=E6=9D=83=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 授权页面分页 --- apps/perms/api.py | 4 ++++ apps/perms/templates/perms/asset_permission_list.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index 33a027064..d9863d2a2 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404 from rest_framework.views import APIView, Response from rest_framework.generics import ListAPIView, get_object_or_404, RetrieveUpdateAPIView from rest_framework import viewsets +from rest_framework.pagination import LimitOffsetPagination from common.utils import set_or_append_attr_bulk, get_object_or_none from users.permissions import IsValidUser, IsSuperUser, IsSuperUserOrAppUser @@ -19,9 +20,12 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): """ 资产授权列表的增删改查api """ + filter_fields = ("name",) + search_fields = filter_fields queryset = AssetPermission.objects.all() serializer_class = serializers.AssetPermissionCreateUpdateSerializer permission_classes = (IsSuperUser,) + pagination_class = LimitOffsetPagination def get_serializer_class(self): if self.action in ("list", 'retrieve'): diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index c18f12224..2f0f74312 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -208,7 +208,7 @@ function initTable() { select: {}, op_html: $('#actions').html() }; - table = jumpserver.initDataTable(options); + table = jumpserver.initServerSideDataTable(options); return table } From fd3df81a64dd2e51d942ba1517df675667b9a840 Mon Sep 17 00:00:00 2001 From: wstart <371475305@qq.com> Date: Tue, 10 Jul 2018 17:03:31 +0800 Subject: [PATCH 7/7] Update api.py --- apps/perms/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index d9863d2a2..d990d4db4 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -25,7 +25,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): queryset = AssetPermission.objects.all() serializer_class = serializers.AssetPermissionCreateUpdateSerializer permission_classes = (IsSuperUser,) - pagination_class = LimitOffsetPagination + pagination_class = LimitOffsetPagination def get_serializer_class(self): if self.action in ("list", 'retrieve'):