From bea5dadbac475b773513fccc94428af3ddd85573 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 15 Nov 2019 11:56:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BB=88?= =?UTF-8?q?=E7=AB=AF=E6=B3=A8=E5=86=8C=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=88=E4=BB=8E=20serializer=20->=20view?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api_v2/terminal.py | 4 ++++ apps/terminal/serializers_v2/terminal.py | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/terminal/api_v2/terminal.py b/apps/terminal/api_v2/terminal.py index bad0aabc9..629fe6115 100644 --- a/apps/terminal/api_v2/terminal.py +++ b/apps/terminal/api_v2/terminal.py @@ -3,6 +3,7 @@ from rest_framework import viewsets, generics from rest_framework import status from rest_framework.response import Response +from django.conf import settings from common.permissions import IsSuperUser, WithBootstrapToken @@ -29,6 +30,9 @@ class TerminalRegistrationApi(generics.CreateAPIView): serializer = serializers.TerminalSerializer( data=data, context={'request': request} ) + if not settings.SECURITY_SERVICE_ACCOUNT_REGISTRATION: + data = {"error": "service account registration disabled"} + return Response(data=data, status=status.HTTP_400_BAD_REQUEST) serializer.is_valid(raise_exception=True) terminal = serializer.save() sa_serializer = serializer.sa_serializer_class(instance=terminal.user) diff --git a/apps/terminal/serializers_v2/terminal.py b/apps/terminal/serializers_v2/terminal.py index 021519564..f4e26b230 100644 --- a/apps/terminal/serializers_v2/terminal.py +++ b/apps/terminal/serializers_v2/terminal.py @@ -28,9 +28,6 @@ class TerminalSerializer(serializers.ModelSerializer): valid = super().is_valid(raise_exception=raise_exception) if not valid: return valid - if not settings.SECURITY_SERVICE_ACCOUNT_REGISTRATION: - error = {"error": "service account registration disabled"} - raise serializers.ValidationError(error) data = {'name': self.validated_data.get('name')} kwargs = {'data': data} if self.instance and self.instance.user: From 9b5cb8b0c553993a3cfe616442c9abfa8d78d438 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 15 Nov 2019 12:11:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E9=99=90=E5=88=B6=E9=80=9A?= =?UTF-8?q?=E8=BF=87=20POST=20=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=20Termi?= =?UTF-8?q?nalViewSet=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api_v2/terminal.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/terminal/api_v2/terminal.py b/apps/terminal/api_v2/terminal.py index 629fe6115..57b8ab3e3 100644 --- a/apps/terminal/api_v2/terminal.py +++ b/apps/terminal/api_v2/terminal.py @@ -18,6 +18,9 @@ class TerminalViewSet(viewsets.ModelViewSet): queryset = Terminal.objects.filter(is_deleted=False) serializer_class = serializers.TerminalSerializer permission_classes = [IsSuperUser] + http_method_names = [ + 'get', 'put', 'patch', 'delete', 'head', 'options', 'trace' + ] class TerminalRegistrationApi(generics.CreateAPIView): From c6e7872ba8748d7b28bec95216d76faff4b21986 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 15 Nov 2019 14:58:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E8=B5=84=E4=BA=A7=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/backends/base.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/assets/backends/base.py b/apps/assets/backends/base.py index 801bfbbb1..d46c67f70 100644 --- a/apps/assets/backends/base.py +++ b/apps/assets/backends/base.py @@ -38,6 +38,9 @@ class AssetUserQuerySet(list): if len(v) == 0: return self if k.find("__in") >= 0: + _k = k.split('__')[0] + in_kwargs[_k] = v + else: in_kwargs[k] = v for k in in_kwargs: kwargs.pop(k) @@ -45,17 +48,16 @@ class AssetUserQuerySet(list): if len(in_kwargs) == 0: return self for i in self: - matched = True + matched = False for k, v in in_kwargs.items(): - key = k.split('__')[0] - attr = getattr(i, key, None) + attr = getattr(i, k, None) # 如果属性或者value中是uuid,则转换成string if isinstance(v[0], uuid.UUID): v = [str(i) for i in v] if isinstance(attr, uuid.UUID): attr = str(attr) - if attr not in v: - matched = False + if v in attr: + matched = True if matched: queryset.append(i) return AssetUserQuerySet(queryset)