[Update] 默认使用page

apps/applications/api/remote_app.py

@@ -3,7 +3,6 @@
 
 
 from rest_framework import generics
-from rest_framework.pagination import LimitOffsetPagination
 from rest_framework_bulk import BulkModelViewSet
 
 from ..hands import IsOrgAdmin, IsAppUser
@@ -22,7 +21,6 @@ class RemoteAppViewSet(BulkModelViewSet):
     permission_classes = (IsOrgAdmin,)
     queryset = RemoteApp.objects.all()
     serializer_class = RemoteAppSerializer
-    pagination_class = LimitOffsetPagination
 
 
 class RemoteAppConnectionInfoApi(generics.RetrieveAPIView):

apps/assets/api/admin_user.py

@@ -17,8 +17,7 @@ from django.db import transaction
 from django.shortcuts import get_object_or_404
 from rest_framework import generics
 from rest_framework.response import Response
-from rest_framework_bulk import BulkModelViewSet
-from rest_framework.pagination import LimitOffsetPagination
+from orgs.mixins import OrgBulkModelViewSet
 
 from common.mixins import IDInCacheFilterMixin
 from common.utils import get_logger
@@ -36,7 +35,7 @@ __all__ = [
 ]
 
 
-class AdminUserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
+class AdminUserViewSet(OrgBulkModelViewSet):
     """
     Admin user api set, for add,delete,update,list,retrieve resource
     """
@@ -46,11 +45,6 @@ class AdminUserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
     queryset = AdminUser.objects.all()
     serializer_class = serializers.AdminUserSerializer
     permission_classes = (IsOrgAdmin,)
-    pagination_class = LimitOffsetPagination
-
-    def get_queryset(self):
-        queryset = super().get_queryset().all()
-        return queryset
 
 
 class AdminUserAuthApi(generics.UpdateAPIView):
@@ -98,7 +92,6 @@ class AdminUserTestConnectiveApi(generics.RetrieveAPIView):
 class AdminUserAssetsListView(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetSimpleSerializer
-    pagination_class = LimitOffsetPagination
     filter_fields = ("hostname", "ip")
     http_method_names = ['get']
     search_fields = filter_fields

apps/assets/api/asset.py

@@ -5,7 +5,6 @@ import random
 
 from rest_framework import generics
 from rest_framework.response import Response
-from rest_framework.pagination import LimitOffsetPagination
 from django.utils.translation import ugettext_lazy as _
 from django.shortcuts import get_object_or_404
 from django.db.models import Q
@@ -37,7 +36,6 @@ class AssetViewSet(LabelFilter, OrgBulkModelViewSet):
     ordering_fields = ("hostname", "ip", "port", "cpu_cores")
     queryset = Asset.objects.all()
     serializer_class = serializers.AssetSerializer
-    pagination_class = LimitOffsetPagination
     permission_classes = (IsOrgAdminOrAppUser,)
     success_message = _("%(hostname)s was %(action)s successfully")
 

apps/assets/api/asset_user.py

@@ -3,7 +3,6 @@
 
 from rest_framework.response import Response
 from rest_framework import generics
-from rest_framework.pagination import LimitOffsetPagination
 from rest_framework import filters
 from rest_framework_bulk import BulkModelViewSet
 from django.shortcuts import get_object_or_404
@@ -54,7 +53,6 @@ class AssetUserSearchBackend(filters.BaseFilterBackend):
 
 
 class AssetUserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
-    pagination_class = LimitOffsetPagination
     serializer_class = serializers.AssetUserSerializer
     permission_classes = [IsOrgAdminOrAppUser]
     http_method_names = ['get', 'post']
@@ -68,6 +66,9 @@ class AssetUserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
         AssetUserFilterBackend, AssetUserSearchBackend,
     )
 
+    def allow_bulk_destroy(self, qs, filtered):
+        return False
+
     def get_queryset(self):
         # 尽可能先返回更少的数据
         username = self.request.GET.get('username')

apps/assets/api/cmd_filter.py

@@ -2,7 +2,6 @@
 #
 
 from rest_framework_bulk import BulkModelViewSet
-from rest_framework.pagination import LimitOffsetPagination
 from django.shortcuts import get_object_or_404
 
 from ..hands import IsOrgAdmin
@@ -19,7 +18,6 @@ class CommandFilterViewSet(BulkModelViewSet):
     permission_classes = (IsOrgAdmin,)
     queryset = CommandFilter.objects.all()
     serializer_class = serializers.CommandFilterSerializer
-    pagination_class = LimitOffsetPagination
 
 
 class CommandFilterRuleViewSet(BulkModelViewSet):
@@ -27,7 +25,6 @@ class CommandFilterRuleViewSet(BulkModelViewSet):
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.CommandFilterRuleSerializer
-    pagination_class = LimitOffsetPagination
 
     def get_queryset(self):
         fpk = self.kwargs.get('filter_pk')

apps/assets/api/domain.py

@@ -2,12 +2,10 @@
 
 from rest_framework_bulk import BulkModelViewSet
 from rest_framework.views import APIView, Response
-from rest_framework.pagination import LimitOffsetPagination
-
 from django.views.generic.detail import SingleObjectMixin
 
 from common.utils import get_logger
-from common.permissions import IsOrgAdmin, IsAppUser, IsOrgAdminOrAppUser
+from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
 from ..models import Domain, Gateway
 from .. import serializers
 
@@ -20,7 +18,6 @@ class DomainViewSet(BulkModelViewSet):
     queryset = Domain.objects.all()
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.DomainSerializer
-    pagination_class = LimitOffsetPagination
 
     def get_queryset(self):
         queryset = super().get_queryset().all()
@@ -43,7 +40,6 @@ class GatewayViewSet(BulkModelViewSet):
     queryset = Gateway.objects.all()
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.GatewaySerializer
-    pagination_class = LimitOffsetPagination
 
 
 class GatewayTestConnectionApi(SingleObjectMixin, APIView):

apps/assets/api/label.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from rest_framework.pagination import LimitOffsetPagination
 from django.db.models import Count
 
 from common.utils import get_logger
@@ -32,7 +31,6 @@ class LabelViewSet(OrgBulkModelViewSet):
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.LabelSerializer
-    pagination_class = LimitOffsetPagination
 
     def list(self, request, *args, **kwargs):
         if request.query_params.get("distinct"):

apps/assets/api/system_user.py

@@ -16,7 +16,6 @@
 from django.shortcuts import get_object_or_404
 from rest_framework import generics
 from rest_framework.response import Response
-from rest_framework.pagination import LimitOffsetPagination
 
 from common.utils import get_logger
 from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
@@ -49,7 +48,6 @@ class SystemUserViewSet(OrgBulkModelViewSet):
     queryset = SystemUser.objects.all()
     serializer_class = serializers.SystemUserSerializer
     permission_classes = (IsOrgAdminOrAppUser,)
-    pagination_class = LimitOffsetPagination
 
     def get_queryset(self):
         queryset = super().get_queryset().all()
@@ -120,7 +118,6 @@ class SystemUserTestConnectiveApi(generics.RetrieveAPIView):
 class SystemUserAssetsListView(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetSimpleSerializer
-    pagination_class = LimitOffsetPagination
     filter_fields = ("hostname", "ip")
     http_method_names = ['get']
     search_fields = filter_fields

apps/authentication/api/access_key.py

@@ -2,7 +2,6 @@
 #
 
 from rest_framework.viewsets import ModelViewSet
-from rest_framework.pagination import LimitOffsetPagination
 
 from common.permissions import IsValidUser
 from .. import serializers
@@ -11,7 +10,6 @@ from .. import serializers
 class AccessKeyViewSet(ModelViewSet):
     permission_classes = (IsValidUser,)
     serializer_class = serializers.AccessKeySerializer
-    pagination_class = LimitOffsetPagination
     search_fields = ['^id', '^secret']
 
     def get_queryset(self):

apps/orgs/mixins/api.py

@@ -34,6 +34,9 @@ class OrgBulkModelViewSet(IDInCacheFilterMixin, BulkModelViewSet):
             queryset = self.serializer_class.setup_eager_loading(queryset)
         return queryset
 
+    def allow_bulk_destroy(self, qs, filtered):
+        return False
+
 
 class OrgMembershipModelViewSetMixin:
     org = None

apps/perms/api/asset_permission.py

@@ -7,7 +7,6 @@ from rest_framework.views import Response
 from django.shortcuts import get_object_or_404
 from rest_framework.generics import RetrieveUpdateAPIView, ListAPIView
 from rest_framework import viewsets
-from rest_framework.pagination import LimitOffsetPagination
 
 from common.permissions import IsOrgAdmin
 from common.utils import get_object_or_none
@@ -31,7 +30,6 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
     """
     queryset = AssetPermission.objects.all()
     serializer_class = serializers.AssetPermissionCreateUpdateSerializer
-    pagination_class = LimitOffsetPagination
     filter_fields = ['name']
     permission_classes = (IsOrgAdmin,)
 
@@ -247,7 +245,6 @@ class AssetPermissionAddAssetApi(RetrieveUpdateAPIView):
 
 class AssetPermissionAssetsApi(ListAPIView):
     permission_classes = (IsOrgAdmin,)
-    pagination_class = LimitOffsetPagination
     serializer_class = serializers.AssetPermissionAssetsSerializer
     filter_fields = ("hostname", "ip")
     search_fields = filter_fields

apps/perms/api/remote_app_permission.py

 #  coding: utf-8
 #
 
-
 from rest_framework import viewsets, generics
-from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.views import Response
 
 from common.permissions import IsOrgAdmin
-
 from ..models import RemoteAppPermission
 from ..serializers import (
     RemoteAppPermissionSerializer,
@@ -28,7 +25,6 @@ class RemoteAppPermissionViewSet(viewsets.ModelViewSet):
     search_fields = filter_fields
     queryset = RemoteAppPermission.objects.all()
     serializer_class = RemoteAppPermissionSerializer
-    pagination_class = LimitOffsetPagination
     permission_classes = (IsOrgAdmin,)
 
 

apps/perms/api/user_permission.py

 # -*- coding: utf-8 -*-
 #
 import uuid
+
 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, RetrieveAPIView
 )
-from rest_framework.pagination import LimitOffsetPagination
 
 from common.permissions import IsValidUser, IsOrgAdminOrAppUser, IsOrgAdmin
 from common.tree import TreeNodeSerializer
@@ -40,7 +39,6 @@ class UserGrantedAssetsApi(UserPermissionCacheMixin, GrantAssetsMixin, ListAPIVi
     用户授权的所有资产
     """
     permission_classes = (IsOrgAdminOrAppUser,)
-    pagination_class = LimitOffsetPagination
 
     def get_object(self):
         user_id = self.kwargs.get('pk', '')
@@ -67,7 +65,6 @@ class UserGrantedNodeAssetsApi(UserPermissionCacheMixin, GrantAssetsMixin, ListA
     查询用户授权的节点下的资产的api, 与上面api不同的是，只返回某个节点下的资产
     """
     permission_classes = (IsOrgAdminOrAppUser,)
-    pagination_class = LimitOffsetPagination
 
     def get_object(self):
         user_id = self.kwargs.get('pk', '')
@@ -121,7 +118,6 @@ class UserGrantedNodesApi(UserPermissionCacheMixin, NodesWithUngroupMixin, ListA
     """
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = NodeSerializer
-    pagination_class = LimitOffsetPagination
     only_fields = NodeSerializer.Meta.only_fields
 
     def get_object(self):
@@ -187,8 +183,6 @@ class UserGrantedNodesWithAssetsApi(UserPermissionCacheMixin, NodesWithUngroupMi
     """
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.NodeGrantedSerializer
-    pagination_class = LimitOffsetPagination
-
     nodes_only_fields = serializers.NodeGrantedSerializer.Meta.only_fields
     assets_only_fields = serializers.NodeGrantedSerializer.assets_only_fields
     system_users_only_fields = serializers.NodeGrantedSerializer.system_users_only_fields

apps/perms/api/user_remote_app_permission.py

@@ -5,7 +5,6 @@ from rest_framework.views import APIView, Response
 from rest_framework.generics import (
     ListAPIView, get_object_or_404,
 )
-from rest_framework.pagination import LimitOffsetPagination
 
 from common.permissions import IsValidUser, IsOrgAdminOrAppUser
 from common.tree import TreeNodeSerializer
@@ -26,7 +25,6 @@ __all__ = [
 class UserGrantedRemoteAppsApi(RemoteAppFilterMixin, ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = RemoteAppSerializer
-    pagination_class = LimitOffsetPagination
 
     def get_object(self):
         user_id = self.kwargs.get('pk', '')

apps/settings/api.py

@@ -7,7 +7,6 @@ import jms_storage
 
 from rest_framework import generics
 from rest_framework.views import Response, APIView
-from rest_framework.pagination import LimitOffsetPagination
 from django.conf import settings
 from django.core.mail import send_mail
 from django.utils.translation import ugettext_lazy as _
@@ -94,7 +93,6 @@ class LDAPTestingAPI(APIView):
 
 
 class LDAPUserListApi(generics.ListAPIView):
-    pagination_class = LimitOffsetPagination
     permission_classes = (IsOrgAdmin,)
     serializer_class = LDAPUserSerializer
 

apps/terminal/api/command.py

@@ -3,7 +3,6 @@
 import time
 from django.utils import timezone
 from django.shortcuts import HttpResponse
-from rest_framework.pagination import LimitOffsetPagination
 from rest_framework import viewsets
 from rest_framework import generics
 from rest_framework.response import Response
@@ -23,7 +22,6 @@ __all__ = ['CommandViewSet', 'CommandExportApi']
 
 class CommandQueryMixin:
     command_store = get_command_storage()
-    pagination_class = LimitOffsetPagination
     permission_classes = [IsOrgAdminOrAppUser | IsAuditor]
     filter_fields = [
         "asset", "system_user", "user", "session",

apps/terminal/api/session.py

@@ -6,7 +6,6 @@ from django.shortcuts import get_object_or_404
 from django.core.files.storage import default_storage
 from django.http import HttpResponseNotFound
 from django.conf import settings
-from rest_framework.pagination import LimitOffsetPagination
 from rest_framework import viewsets
 from rest_framework.response import Response
 from rest_framework.generics import GenericAPIView
@@ -28,7 +27,6 @@ logger = get_logger(__name__)
 class SessionViewSet(OrgBulkModelViewSet):
     queryset = Session.objects.all()
     serializer_class = serializers.SessionSerializer
-    pagination_class = LimitOffsetPagination
     permission_classes = (IsOrgAdminOrAppUser | IsAuditor, )
     filter_fields = [
         "user", "asset", "system_user", "remote_addr",

apps/users/api/group.py

@@ -3,7 +3,6 @@
 
 from rest_framework import generics
 from rest_framework_bulk import BulkModelViewSet
-from rest_framework.pagination import LimitOffsetPagination
 
 from ..serializers import (
     UserGroupSerializer,
@@ -24,7 +23,6 @@ class UserGroupViewSet(IDInCacheFilterMixin, BulkModelViewSet):
     queryset = UserGroup.objects.all()
     serializer_class = UserGroupSerializer
     permission_classes = (IsOrgAdmin,)
-    pagination_class = LimitOffsetPagination
 
     def get_serializer_class(self):
         if self.action in ("list", 'retrieve') and \

apps/users/api/user.py

@@ -10,7 +10,6 @@ from rest_framework import generics
 from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
 from rest_framework_bulk import BulkModelViewSet
-from rest_framework.pagination import LimitOffsetPagination
 
 from common.permissions import (
     IsOrgAdmin, IsCurrentUserOrReadOnly, IsOrgAdminOrAppUser,
@@ -38,7 +37,6 @@ class UserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
     queryset = User.objects.exclude(role=User.ROLE_APP)
     serializer_class = serializers.UserSerializer
     permission_classes = (IsOrgAdmin, CanUpdateDeleteSuperUser)
-    pagination_class = LimitOffsetPagination
 
     def send_created_signal(self, users):
         if not isinstance(users, list):
@@ -82,9 +80,7 @@ class UserViewSet(IDInCacheFilterMixin, BulkModelViewSet):
             return False
 
     def allow_bulk_destroy(self, qs, filtered):
-        if self._bulk_deny_permission(filtered):
-            return False
-        return qs.count() != filtered.count()
+        return False
 
     def bulk_update(self, request, *args, **kwargs):
         """