From 0b89ff17fdc981a177eb9e87114d97c4f568abba Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 2 May 2018 10:48:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/__init__.py | 2 +- apps/templates/_footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/__init__.py b/apps/__init__.py index def994bcd..90767858b 100644 --- a/apps/__init__.py +++ b/apps/__init__.py @@ -2,4 +2,4 @@ # -*- coding: utf-8 -*- # -__version__ = "1.2.1" +__version__ = "1.3.0" diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html index f23c89399..8a723646d 100644 --- a/apps/templates/_footer.html +++ b/apps/templates/_footer.html @@ -1,6 +1,6 @@
- Version 1.2.1-{% include '_build.html' %} GPLv2. + Version 1.3.0-{% include '_build.html' %} GPLv2.
From e291ca90573da4806822e1095f686a72c8d1ebf2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 2 May 2018 18:15:48 +0800 Subject: [PATCH 2/8] =?UTF-8?q?[Update]=20=E9=BB=98=E8=AE=A4=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index dd660bc42..f1773df11 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -22,7 +22,7 @@ TIMEOUT = 60 logger = get_logger(__file__) CACHE_MAX_TIME = 60*60*60 disk_pattern = re.compile(r'^hd|sd|xvd|vd') -PERIOD_TASK = os.environ.get("PERIOD_TASK", "on") +PERIOD_TASK = os.environ.get("PERIOD_TASK", "off") @shared_task From cde2e7adb06698d40957a2ade78be6151c5068d0 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 4 May 2018 14:54:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E5=88=97=E8=A1=A8=E5=88=9B=E5=BB=BAapi=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9Eid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/perms/serializers.py b/apps/perms/serializers.py index baa823a6f..0f0419eff 100644 --- a/apps/perms/serializers.py +++ b/apps/perms/serializers.py @@ -9,7 +9,7 @@ from common.fields import StringManyToManyField class AssetPermissionCreateUpdateSerializer(serializers.ModelSerializer): class Meta: model = AssetPermission - exclude = ('id', 'created_by', 'date_created') + exclude = ('created_by', 'date_created') class AssetPermissionListSerializer(serializers.ModelSerializer): From 4ed9e110909c1ec07f0f3b2d0a6f2dba6300d0b3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 4 May 2018 14:58:52 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/validators.py b/apps/common/validators.py index 9a4c1e501..b273bd1de 100644 --- a/apps/common/validators.py +++ b/apps/common/validators.py @@ -4,4 +4,4 @@ from django.core.validators import RegexValidator from django.utils.translation import ugettext_lazy as _ -alphanumeric = RegexValidator(r'^[0-9a-zA-Z_-]*$', _('Special char not allowed')) \ No newline at end of file +alphanumeric = RegexValidator(r'^[0-9a-zA-Z_@\-\.]*$', _('Special char not allowed')) \ No newline at end of file From 01d136cf1ec69bb8577c1acfbea1ca8b9a40f97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Fri, 4 May 2018 15:01:49 +0800 Subject: [PATCH 5/8] Perms return (#1293) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 修改版本号 * [Update] 默认关闭定时任务 * [Update] 修改授权列表创建api，返回id * [Update] 修改用户名校验规则 --- apps/assets/tasks.py | 2 +- apps/common/validators.py | 2 +- apps/perms/serializers.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index dd660bc42..f1773df11 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -22,7 +22,7 @@ TIMEOUT = 60 logger = get_logger(__file__) CACHE_MAX_TIME = 60*60*60 disk_pattern = re.compile(r'^hd|sd|xvd|vd') -PERIOD_TASK = os.environ.get("PERIOD_TASK", "on") +PERIOD_TASK = os.environ.get("PERIOD_TASK", "off") @shared_task diff --git a/apps/common/validators.py b/apps/common/validators.py index 9a4c1e501..b273bd1de 100644 --- a/apps/common/validators.py +++ b/apps/common/validators.py @@ -4,4 +4,4 @@ from django.core.validators import RegexValidator from django.utils.translation import ugettext_lazy as _ -alphanumeric = RegexValidator(r'^[0-9a-zA-Z_-]*$', _('Special char not allowed')) \ No newline at end of file +alphanumeric = RegexValidator(r'^[0-9a-zA-Z_@\-\.]*$', _('Special char not allowed')) \ No newline at end of file diff --git a/apps/perms/serializers.py b/apps/perms/serializers.py index baa823a6f..0f0419eff 100644 --- a/apps/perms/serializers.py +++ b/apps/perms/serializers.py @@ -9,7 +9,7 @@ from common.fields import StringManyToManyField class AssetPermissionCreateUpdateSerializer(serializers.ModelSerializer): class Meta: model = AssetPermission - exclude = ('id', 'created_by', 'date_created') + exclude = ('created_by', 'date_created') class AssetPermissionListSerializer(serializers.ModelSerializer): From 941e55bdec074fec71242c9d53b7d9b4da404ef6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 7 May 2018 13:11:02 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0ldap=20auth=20?= =?UTF-8?q?timeout=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 0afcd4e72..b75b73ec9 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -329,6 +329,9 @@ AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER AUTH_LDAP_GROUP_SEARCH = LDAPSearch( AUTH_LDAP_GROUP_SEARCH_OU, ldap.SCOPE_SUBTREE, AUTH_LDAP_GROUP_SEARCH_FILTER ) +AUTH_LDAP_CONNECTION_OPTIONS = { + ldap.TIMEOUT: 5 +} AUTH_LDAP_ALWAYS_UPDATE_USER = True AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend' From e9b86ca668b71124d7b8af4123dad246d673d62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Tue, 8 May 2018 09:05:10 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9replay=20api?= =?UTF-8?q?=20(#1298)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api.py | 50 ++++++++++++---------------------- apps/terminal/views/session.py | 3 +- 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index a964e9729..eb4b6400a 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -304,40 +304,24 @@ class SessionReplayViewSet(viewsets.ViewSet): return HttpResponseNotFound() -class SessionReplayV2ViewSet(viewsets.ViewSet): +class SessionReplayV2ViewSet(SessionReplayViewSet): serializer_class = ReplaySerializer permission_classes = (IsSuperUserOrAppUser,) session = None - def gen_session_path(self): - date = self.session.date_start.strftime('%Y-%m-%d') - replay = { - "id": self.session.id, - # "width": 100, - # "heith": 100 - } - if self.session.protocol == "ssh": - replay['type'] = "json" - replay['path'] = os.path.join(date, str(self.session.id) + '.gz') - return replay - elif self.session.protocol == "rdp": - replay['type'] = "mp4" - replay['path'] = os.path.join(date, str(self.session.id) + '.mp4') - return replay - else: - return replay - def retrieve(self, request, *args, **kwargs): session_id = kwargs.get('pk') self.session = get_object_or_404(Session, id=session_id) - replay = self.gen_session_path() - - if replay.get("path", "") == "": - return HttpResponseNotFound() + path = self.gen_session_path() + data = { + 'type': 'guacamole' if self.session.protocol == 'rdp' else 'json', + 'src': '', + } - if default_storage.exists(replay["path"]): - replay["src"] = default_storage.url(replay["path"]) - return Response(replay) + if default_storage.exists(path): + url = default_storage.url(path) + data['src'] = url + return Response(data) else: configs = settings.TERMINAL_REPLAY_STORAGE.items() if not configs: @@ -345,13 +329,15 @@ class SessionReplayV2ViewSet(viewsets.ViewSet): for name, config in configs: client = jms_storage.init(config) + 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 - target_path = default_storage.base_location + '/' + replay["path"] - - if client and client.has_file(replay["path"]) and \ - client.download_file(replay["path"], target_path): - replay["src"] = default_storage.url(replay["path"]) - return Response(replay) + if client and client.has_file(file_path) and \ + client.download_file(file_path, target_path): + url = default_storage.url(path) + data['src'] = url + return Response(data) return HttpResponseNotFound() diff --git a/apps/terminal/views/session.py b/apps/terminal/views/session.py index 24e323647..3b66baff7 100644 --- a/apps/terminal/views/session.py +++ b/apps/terminal/views/session.py @@ -47,8 +47,7 @@ class SessionListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView): filter_kwargs['system_user'] = self.system_user if filter_kwargs: self.queryset = self.queryset.filter(**filter_kwargs) - # Todo: 暂时隐藏rdp - return self.queryset.filter(protocol='ssh') + return self.queryset def get_context_data(self, **kwargs): context = { From 2a8358b1aa0ebb899ccb7a77d670c82c62e7c579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Tue, 8 May 2018 10:48:52 +0800 Subject: [PATCH 8/8] Bugfix ldap option (#1300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 修改replay api * [Bugfix] 修复ldap参数改错引起的bug --- apps/jumpserver/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index b75b73ec9..af72292f7 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -330,7 +330,7 @@ AUTH_LDAP_GROUP_SEARCH = LDAPSearch( AUTH_LDAP_GROUP_SEARCH_OU, ldap.SCOPE_SUBTREE, AUTH_LDAP_GROUP_SEARCH_FILTER ) AUTH_LDAP_CONNECTION_OPTIONS = { - ldap.TIMEOUT: 5 + ldap.OPT_TIMEOUT: 5 } AUTH_LDAP_ALWAYS_UPDATE_USER = True AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend'