mirror of https://github.com/jumpserver/jumpserver
perf(api): filter_fields被filterset_fields取代
https://django-filter.readthedocs.io/en/stable/guide/migration.htmlpull/5393/head
parent
ff4748f9f4
commit
e7a3c5a822
|
@ -12,8 +12,8 @@ __all__ = ['ApplicationViewSet']
|
|||
|
||||
class ApplicationViewSet(OrgBulkModelViewSet):
|
||||
model = models.Application
|
||||
filter_fields = ('name', 'type', 'category')
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('name', 'type', 'category')
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdminOrAppUser,)
|
||||
serializer_class = serializers.ApplicationSerializer
|
||||
|
||||
|
|
|
@ -29,8 +29,8 @@ class AdminUserViewSet(OrgBulkModelViewSet):
|
|||
Admin user api set, for add,delete,update,list,retrieve resource
|
||||
"""
|
||||
model = AdminUser
|
||||
filter_fields = ("name", "username")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name", "username")
|
||||
search_fields = filterset_fields
|
||||
serializer_class = serializers.AdminUserSerializer
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
|
||||
|
@ -93,8 +93,8 @@ class AdminUserTestConnectiveApi(generics.RetrieveAPIView):
|
|||
class AdminUserAssetsListView(generics.ListAPIView):
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.AssetSimpleSerializer
|
||||
filter_fields = ("hostname", "ip")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("hostname", "ip")
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_object(self):
|
||||
pk = self.kwargs.get('pk')
|
||||
|
|
|
@ -32,7 +32,7 @@ class AssetViewSet(FilterAssetByNodeMixin, OrgBulkModelViewSet):
|
|||
API endpoint that allows Asset to be viewed or edited.
|
||||
"""
|
||||
model = Asset
|
||||
filter_fields = (
|
||||
filterset_fields = (
|
||||
"hostname", "ip", "systemuser__id", "admin_user__id", "platform__base",
|
||||
"is_active"
|
||||
)
|
||||
|
@ -76,7 +76,7 @@ class AssetPlatformViewSet(ModelViewSet):
|
|||
queryset = Platform.objects.all()
|
||||
permission_classes = (IsSuperUser,)
|
||||
serializer_class = serializers.PlatformSerializer
|
||||
filter_fields = ['name', 'base']
|
||||
filterset_fields = ['name', 'base']
|
||||
search_fields = ['name']
|
||||
|
||||
def get_permissions(self):
|
||||
|
|
|
@ -78,7 +78,7 @@ class AssetUserViewSet(CommonApiMixin, BulkModelViewSet):
|
|||
'retrieve': serializers.AssetUserReadSerializer,
|
||||
}
|
||||
permission_classes = [IsOrgAdminOrAppUser]
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
"id", "ip", "hostname", "username",
|
||||
"asset_id", "node_id",
|
||||
"prefer", "prefer_id",
|
||||
|
@ -131,7 +131,7 @@ class AssetUserTaskCreateAPI(generics.CreateAPIView):
|
|||
permission_classes = (IsOrgAdminOrAppUser,)
|
||||
serializer_class = serializers.AssetUserTaskSerializer
|
||||
filter_backends = AssetUserViewSet.filter_backends
|
||||
filter_fields = AssetUserViewSet.filter_fields
|
||||
filterset_fields = AssetUserViewSet.filterset_fields
|
||||
|
||||
def get_asset_users(self):
|
||||
manager = AssetUserManager()
|
||||
|
|
|
@ -14,16 +14,16 @@ __all__ = ['CommandFilterViewSet', 'CommandFilterRuleViewSet']
|
|||
|
||||
class CommandFilterViewSet(OrgBulkModelViewSet):
|
||||
model = CommandFilter
|
||||
filter_fields = ("name",)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name",)
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.CommandFilterSerializer
|
||||
|
||||
|
||||
class CommandFilterRuleViewSet(OrgBulkModelViewSet):
|
||||
model = CommandFilterRule
|
||||
filter_fields = ("content",)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("content",)
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.CommandFilterRuleSerializer
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@ __all__ = ['DomainViewSet', 'GatewayViewSet', "GatewayTestConnectionApi"]
|
|||
|
||||
class DomainViewSet(OrgBulkModelViewSet):
|
||||
model = Domain
|
||||
filter_fields = ("name", )
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name", )
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdminOrAppUser,)
|
||||
serializer_class = serializers.DomainSerializer
|
||||
|
||||
|
@ -31,7 +31,7 @@ class DomainViewSet(OrgBulkModelViewSet):
|
|||
|
||||
class GatewayViewSet(OrgBulkModelViewSet):
|
||||
model = Gateway
|
||||
filter_fields = ("domain__name", "name", "username", "ip", "domain")
|
||||
filterset_fields = ("domain__name", "name", "username", "ip", "domain")
|
||||
search_fields = ("domain__name", "name", "username", "ip")
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.GatewaySerializer
|
||||
|
|
|
@ -13,7 +13,7 @@ __all__ = ['FavoriteAssetViewSet']
|
|||
class FavoriteAssetViewSet(BulkModelViewSet):
|
||||
serializer_class = FavoriteAssetSerializer
|
||||
permission_classes = (IsValidUser,)
|
||||
filter_fields = ['asset']
|
||||
filterset_fields = ['asset']
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
with tmp_to_root_org():
|
||||
|
|
|
@ -18,5 +18,5 @@ class GatheredUserViewSet(OrgModelViewSet):
|
|||
permission_classes = [IsOrgAdmin]
|
||||
extra_filter_backends = [AssetRelatedByNodeFilterBackend]
|
||||
|
||||
filter_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__hostname', 'asset_id']
|
||||
filterset_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__hostname', 'asset_id']
|
||||
search_fields = ['username', 'asset__ip', 'asset__hostname']
|
||||
|
|
|
@ -28,8 +28,8 @@ __all__ = ['LabelViewSet']
|
|||
|
||||
class LabelViewSet(OrgBulkModelViewSet):
|
||||
model = Label
|
||||
filter_fields = ("name", "value")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name", "value")
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.LabelSerializer
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ __all__ = [
|
|||
|
||||
class NodeViewSet(OrgModelViewSet):
|
||||
model = Node
|
||||
filter_fields = ('value', 'key', 'id')
|
||||
filterset_fields = ('value', 'key', 'id')
|
||||
search_fields = ('value', )
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.NodeSerializer
|
||||
|
|
|
@ -29,8 +29,8 @@ class SystemUserViewSet(OrgBulkModelViewSet):
|
|||
System user api set, for add,delete,update,list,retrieve resource
|
||||
"""
|
||||
model = SystemUser
|
||||
filter_fields = ("name", "username", "protocol")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name", "username", "protocol")
|
||||
search_fields = filterset_fields
|
||||
serializer_class = serializers.SystemUserSerializer
|
||||
serializer_classes = {
|
||||
'default': serializers.SystemUserSerializer,
|
||||
|
@ -136,8 +136,8 @@ class SystemUserCommandFilterRuleListApi(generics.ListAPIView):
|
|||
class SystemUserAssetsListView(generics.ListAPIView):
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.AssetSimpleSerializer
|
||||
filter_fields = ("hostname", "ip")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("hostname", "ip")
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_object(self):
|
||||
pk = self.kwargs.get('pk')
|
||||
|
|
|
@ -65,7 +65,7 @@ class SystemUserAssetRelationViewSet(BaseRelationViewSet):
|
|||
serializer_class = serializers.SystemUserAssetRelationSerializer
|
||||
model = models.SystemUser.assets.through
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'asset', 'systemuser',
|
||||
]
|
||||
search_fields = [
|
||||
|
@ -91,7 +91,7 @@ class SystemUserNodeRelationViewSet(BaseRelationViewSet):
|
|||
serializer_class = serializers.SystemUserNodeRelationSerializer
|
||||
model = models.SystemUser.nodes.through
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'node', 'systemuser',
|
||||
]
|
||||
search_fields = [
|
||||
|
@ -112,7 +112,7 @@ class SystemUserUserRelationViewSet(BaseRelationViewSet):
|
|||
serializer_class = serializers.SystemUserUserRelationSerializer
|
||||
model = models.SystemUser.users.through
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'user', 'systemuser',
|
||||
]
|
||||
search_fields = [
|
||||
|
|
|
@ -25,8 +25,8 @@ class FTPLogViewSet(CreateModelMixin,
|
|||
date_range_filter_fields = [
|
||||
('date_start', ('date_from', 'date_to'))
|
||||
]
|
||||
filter_fields = ['user', 'asset', 'system_user', 'filename']
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ['user', 'asset', 'system_user', 'filename']
|
||||
search_fields = filterset_fields
|
||||
ordering = ['-date_start']
|
||||
|
||||
|
||||
|
@ -38,7 +38,7 @@ class UserLoginLogViewSet(ListModelMixin, CommonGenericViewSet):
|
|||
date_range_filter_fields = [
|
||||
('datetime', ('date_from', 'date_to'))
|
||||
]
|
||||
filter_fields = ['username', 'ip', 'city', 'type', 'status', 'mfa']
|
||||
filterset_fields = ['username', 'ip', 'city', 'type', 'status', 'mfa']
|
||||
search_fields =['username', 'ip', 'city']
|
||||
|
||||
@staticmethod
|
||||
|
@ -62,7 +62,7 @@ class OperateLogViewSet(ListModelMixin, OrgGenericViewSet):
|
|||
date_range_filter_fields = [
|
||||
('datetime', ('date_from', 'date_to'))
|
||||
]
|
||||
filter_fields = ['user', 'action', 'resource_type', 'resource', 'remote_addr']
|
||||
filterset_fields = ['user', 'action', 'resource_type', 'resource', 'remote_addr']
|
||||
search_fields = ['resource']
|
||||
ordering = ['-datetime']
|
||||
|
||||
|
@ -75,7 +75,7 @@ class PasswordChangeLogViewSet(ListModelMixin, CommonGenericViewSet):
|
|||
date_range_filter_fields = [
|
||||
('datetime', ('date_from', 'date_to'))
|
||||
]
|
||||
filter_fields = ['user', 'change_by', 'remote_addr']
|
||||
filterset_fields = ['user', 'change_by', 'remote_addr']
|
||||
ordering = ['-datetime']
|
||||
|
||||
def get_queryset(self):
|
||||
|
@ -94,7 +94,7 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet):
|
|||
date_range_filter_fields = [
|
||||
('date_start', ('date_from', 'date_to'))
|
||||
]
|
||||
filter_fields = ['user__name', 'command', 'run_as__name', 'is_finished']
|
||||
filterset_fields = ['user__name', 'command', 'run_as__name', 'is_finished']
|
||||
search_fields = ['command', 'user__name', 'run_as__name']
|
||||
ordering = ['-date_created']
|
||||
|
||||
|
@ -108,7 +108,7 @@ class CommandExecutionHostRelationViewSet(OrgRelationMixin, OrgBulkModelViewSet)
|
|||
serializer_class = CommandExecutionHostsRelationSerializer
|
||||
m2m_field = CommandExecution.hosts.field
|
||||
permission_classes = [IsOrgAdmin | IsOrgAuditor]
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'asset', 'commandexecution'
|
||||
]
|
||||
search_fields = ('asset__hostname', )
|
||||
|
|
|
@ -104,12 +104,12 @@ class SimpleMetadataWithFilters(SimpleMetadata):
|
|||
|
||||
def determine_metadata(self, request, view):
|
||||
metadata = super(SimpleMetadataWithFilters, self).determine_metadata(request, view)
|
||||
filter_fields = self.get_filters_fields(request, view)
|
||||
filterset_fields = self.get_filters_fields(request, view)
|
||||
order_fields = self.get_ordering_fields(request, view)
|
||||
|
||||
meta_get = metadata.get("actions", {}).get("GET", {})
|
||||
for k, v in meta_get.items():
|
||||
if k in filter_fields:
|
||||
if k in filterset_fields:
|
||||
v["filter"] = True
|
||||
if k in order_fields:
|
||||
v["order"] = True
|
||||
|
|
|
@ -25,8 +25,8 @@ __all__ = [
|
|||
|
||||
class TaskViewSet(JMSBulkModelViewSet):
|
||||
queryset = Task.objects.all()
|
||||
filter_fields = ("name",)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name",)
|
||||
search_fields = filterset_fields
|
||||
serializer_class = TaskSerializer
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ logger = get_logger(__file__)
|
|||
|
||||
|
||||
class OrgViewSet(BulkModelViewSet):
|
||||
filter_fields = ('name',)
|
||||
filterset_fields = ('name',)
|
||||
search_fields = ('name', 'comment')
|
||||
queryset = Organization.objects.all()
|
||||
serializer_class = OrgSerializer
|
||||
|
|
|
@ -12,8 +12,8 @@ class ApplicationPermissionViewSet(BasePermissionViewSet):
|
|||
"""
|
||||
model = ApplicationPermission
|
||||
serializer_class = serializers.ApplicationPermissionSerializer
|
||||
filter_fields = ['name', 'category', 'type']
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ['name', 'category', 'type']
|
||||
search_fields = filterset_fields
|
||||
custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [
|
||||
'application_id', 'application'
|
||||
]
|
||||
|
|
|
@ -37,7 +37,7 @@ class ApplicationPermissionUserRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.ApplicationPermissionUserRelationSerializer
|
||||
m2m_field = models.ApplicationPermission.users.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', "user", "applicationpermission",
|
||||
]
|
||||
search_fields = ("user__name", "user__username", "applicationpermission__name")
|
||||
|
@ -52,7 +52,7 @@ class ApplicationPermissionUserGroupRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.ApplicationPermissionUserGroupRelationSerializer
|
||||
m2m_field = models.ApplicationPermission.user_groups.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', "usergroup", "applicationpermission"
|
||||
]
|
||||
search_fields = ["usergroup__name", "applicationpermission__name"]
|
||||
|
@ -67,7 +67,7 @@ class ApplicationPermissionApplicationRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.ApplicationPermissionApplicationRelationSerializer
|
||||
m2m_field = models.ApplicationPermission.applications.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'application', 'applicationpermission',
|
||||
]
|
||||
search_fields = ["id", "application__name", "applicationpermission__name"]
|
||||
|
@ -82,7 +82,7 @@ class ApplicationPermissionSystemUserRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.ApplicationPermissionSystemUserRelationSerializer
|
||||
m2m_field = models.ApplicationPermission.system_users.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'systemuser', 'applicationpermission',
|
||||
]
|
||||
search_fields = [
|
||||
|
@ -103,8 +103,8 @@ class ApplicationPermissionAllApplicationListApi(generics.ListAPIView):
|
|||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.ApplicationPermissionAllApplicationSerializer
|
||||
only_fields = serializers.ApplicationPermissionAllApplicationSerializer.Meta.only_fields
|
||||
filter_fields = ('name',)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('name',)
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_queryset(self):
|
||||
pk = self.kwargs.get('pk')
|
||||
|
@ -118,8 +118,8 @@ class ApplicationPermissionAllUserListApi(generics.ListAPIView):
|
|||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.ApplicationPermissionAllUserSerializer
|
||||
only_fields = serializers.ApplicationPermissionAllUserSerializer.Meta.only_fields
|
||||
filter_fields = ('username', 'name')
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('username', 'name')
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_queryset(self):
|
||||
pk = self.kwargs.get('pk')
|
||||
|
|
|
@ -21,7 +21,7 @@ class UserGroupGrantedApplicationsApi(CommonApiMixin, ListAPIView):
|
|||
permission_classes = (IsOrgAdminOrAppUser,)
|
||||
serializer_class = serializers.ApplicationGrantedSerializer
|
||||
only_fields = serializers.ApplicationGrantedSerializer.Meta.only_fields
|
||||
filter_fields = ['id', 'name', 'category', 'type', 'comment']
|
||||
filterset_fields = ['id', 'name', 'category', 'type', 'comment']
|
||||
search_fields = ['name', 'comment']
|
||||
|
||||
def get_queryset(self):
|
||||
|
|
|
@ -25,7 +25,7 @@ __all__ = [
|
|||
class AllGrantedApplicationsMixin(CommonApiMixin, ListAPIView):
|
||||
only_fields = serializers.ApplicationGrantedSerializer.Meta.only_fields
|
||||
serializer_class = serializers.ApplicationGrantedSerializer
|
||||
filter_fields = ['id', 'name', 'category', 'type', 'comment']
|
||||
filterset_fields = ['id', 'name', 'category', 'type', 'comment']
|
||||
search_fields = ['name', 'comment']
|
||||
user: None
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ class AssetPermissionViewSet(BasePermissionViewSet):
|
|||
"""
|
||||
model = AssetPermission
|
||||
serializer_class = serializers.AssetPermissionSerializer
|
||||
filter_fields = ['name']
|
||||
filterset_fields = ['name']
|
||||
custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [
|
||||
'node_id', 'node', 'asset_id', 'hostname', 'ip'
|
||||
]
|
||||
|
|
|
@ -36,7 +36,7 @@ class AssetPermissionUserRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.AssetPermissionUserRelationSerializer
|
||||
m2m_field = models.AssetPermission.users.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', "user", "assetpermission",
|
||||
]
|
||||
search_fields = ("user__name", "user__username", "assetpermission__name")
|
||||
|
@ -51,8 +51,8 @@ class AssetPermissionUserRelationViewSet(RelationMixin):
|
|||
class AssetPermissionAllUserListApi(generics.ListAPIView):
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.AssetPermissionAllUserSerializer
|
||||
filter_fields = ("username", "name")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("username", "name")
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_queryset(self):
|
||||
pk = self.kwargs.get("pk")
|
||||
|
@ -67,7 +67,7 @@ class AssetPermissionUserGroupRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.AssetPermissionUserGroupRelationSerializer
|
||||
m2m_field = models.AssetPermission.user_groups.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', "usergroup", "assetpermission"
|
||||
]
|
||||
search_fields = ["usergroup__name", "assetpermission__name"]
|
||||
|
@ -83,7 +83,7 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.AssetPermissionAssetRelationSerializer
|
||||
m2m_field = models.AssetPermission.assets.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'asset', 'assetpermission',
|
||||
]
|
||||
search_fields = ["id", "asset__hostname", "asset__ip", "assetpermission__name"]
|
||||
|
@ -98,8 +98,8 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
|
|||
class AssetPermissionAllAssetListApi(generics.ListAPIView):
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = serializers.AssetPermissionAllAssetSerializer
|
||||
filter_fields = ("hostname", "ip")
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("hostname", "ip")
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_queryset(self):
|
||||
pk = self.kwargs.get("pk")
|
||||
|
@ -119,7 +119,7 @@ class AssetPermissionNodeRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.AssetPermissionNodeRelationSerializer
|
||||
m2m_field = models.AssetPermission.nodes.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'node', 'assetpermission',
|
||||
]
|
||||
search_fields = ["node__value", "assetpermission__name"]
|
||||
|
@ -135,7 +135,7 @@ class AssetPermissionSystemUserRelationViewSet(RelationMixin):
|
|||
serializer_class = serializers.AssetPermissionSystemUserRelationSerializer
|
||||
m2m_field = models.AssetPermission.system_users.field
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'systemuser', 'assetpermission',
|
||||
]
|
||||
search_fields = [
|
||||
|
|
|
@ -35,7 +35,7 @@ class UserGroupGrantedAssetsApi(ListAPIView):
|
|||
permission_classes = (IsOrgAdminOrAppUser,)
|
||||
serializer_class = serializers.AssetGrantedSerializer
|
||||
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
|
||||
filter_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
filterset_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
search_fields = ['hostname', 'ip', 'comment']
|
||||
|
||||
def get_queryset(self):
|
||||
|
@ -68,7 +68,7 @@ class UserGroupGrantedNodeAssetsApi(ListAPIView):
|
|||
permission_classes = (IsOrgAdminOrAppUser,)
|
||||
serializer_class = serializers.AssetGrantedSerializer
|
||||
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
|
||||
filter_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
filterset_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
search_fields = ['hostname', 'ip', 'comment']
|
||||
|
||||
def get_queryset(self):
|
||||
|
|
|
@ -27,7 +27,7 @@ class UserDirectGrantedAssetsApi(ListAPIView):
|
|||
"""
|
||||
serializer_class = serializers.AssetGrantedSerializer
|
||||
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
|
||||
filter_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
filterset_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
search_fields = ['hostname', 'ip', 'comment']
|
||||
|
||||
def get_queryset(self):
|
||||
|
@ -43,7 +43,7 @@ class UserDirectGrantedAssetsApi(ListAPIView):
|
|||
class UserFavoriteGrantedAssetsApi(ListAPIView):
|
||||
serializer_class = serializers.AssetGrantedSerializer
|
||||
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
|
||||
filter_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
filterset_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
search_fields = ['hostname', 'ip', 'comment']
|
||||
|
||||
def get_queryset(self):
|
||||
|
@ -101,7 +101,7 @@ class MyUngroupAssetsAsTreeApi(ForUserMixin, AssetsAsTreeMixin, UserDirectGrante
|
|||
class UserAllGrantedAssetsApi(ForAdminMixin, ListAPIView):
|
||||
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
|
||||
serializer_class = serializers.AssetGrantedSerializer
|
||||
filter_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
filterset_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
search_fields = ['hostname', 'ip', 'comment']
|
||||
|
||||
def get_queryset(self):
|
||||
|
@ -123,7 +123,7 @@ class MyAllAssetsAsTreeApi(ForUserMixin, AssetsAsTreeMixin, UserAllGrantedAssets
|
|||
class UserGrantedNodeAssetsApi(UserNodeGrantStatusDispatchMixin, ListAPIView):
|
||||
serializer_class = serializers.AssetGrantedSerializer
|
||||
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
|
||||
filter_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
filterset_fields = ['hostname', 'ip', 'id', 'comment']
|
||||
search_fields = ['hostname', 'ip', 'comment']
|
||||
pagination_class = GrantedAssetLimitOffsetPagination
|
||||
pagination_node: Node
|
||||
|
|
|
@ -28,7 +28,7 @@ __all__ = ['CommandViewSet', 'CommandExportApi', 'InsecureCommandAlertAPI']
|
|||
class CommandQueryMixin:
|
||||
command_store = get_command_storage()
|
||||
permission_classes = [IsOrgAdminOrAppUser | IsOrgAuditor]
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
"asset", "system_user", "user", "session", "risk_level",
|
||||
"input"
|
||||
]
|
||||
|
|
|
@ -42,7 +42,7 @@ class SessionViewSet(OrgBulkModelViewSet):
|
|||
'display': serializers.SessionDisplaySerializer,
|
||||
}
|
||||
permission_classes = (IsOrgAdminOrAppUser, )
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
"user", "asset", "system_user", "remote_addr",
|
||||
"protocol", "terminal", "is_finished", 'login_from',
|
||||
]
|
||||
|
|
|
@ -30,16 +30,16 @@ class BaseStorageViewSetMixin:
|
|||
|
||||
|
||||
class CommandStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
|
||||
filter_fields = ('name', 'type',)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('name', 'type',)
|
||||
search_fields = filterset_fields
|
||||
queryset = CommandStorage.objects.all()
|
||||
serializer_class = CommandStorageSerializer
|
||||
permission_classes = (IsSuperUser,)
|
||||
|
||||
|
||||
class ReplayStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
|
||||
filter_fields = ('name', 'type',)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('name', 'type',)
|
||||
search_fields = filterset_fields
|
||||
queryset = ReplayStorage.objects.all()
|
||||
serializer_class = ReplayStorageSerializer
|
||||
permission_classes = (IsSuperUser,)
|
||||
|
|
|
@ -27,7 +27,7 @@ class TerminalViewSet(JMSBulkModelViewSet):
|
|||
queryset = Terminal.objects.filter(is_deleted=False)
|
||||
serializer_class = serializers.TerminalSerializer
|
||||
permission_classes = (IsSuperUser,)
|
||||
filter_fields = ['name', 'remote_addr', 'type']
|
||||
filterset_fields = ['name', 'remote_addr', 'type']
|
||||
|
||||
def create(self, request, *args, **kwargs):
|
||||
if isinstance(request.data, list):
|
||||
|
|
|
@ -12,8 +12,8 @@ from .. import serializers
|
|||
class AssigneeViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
permission_classes = (IsValidUser,)
|
||||
serializer_class = serializers.AssigneeSerializer
|
||||
filter_fields = ('id', 'name', 'username', 'email', 'source')
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('id', 'name', 'username', 'email', 'source')
|
||||
search_fields = filterset_fields
|
||||
|
||||
def get_org(self):
|
||||
org_id = self.request.query_params.get('org_id')
|
||||
|
|
|
@ -28,7 +28,7 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
|
|||
'reject': serializers.TicketRejectSerializer,
|
||||
'close': serializers.TicketCloseSerializer,
|
||||
}
|
||||
filter_fields = [
|
||||
filterset_fields = [
|
||||
'id', 'title', 'type', 'action', 'status', 'applicant', 'applicant_display', 'processor',
|
||||
'processor_display', 'assignees__id'
|
||||
]
|
||||
|
|
|
@ -12,7 +12,7 @@ __all__ = ['UserGroupViewSet']
|
|||
|
||||
class UserGroupViewSet(OrgBulkModelViewSet):
|
||||
model = UserGroup
|
||||
filter_fields = ("name",)
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ("name",)
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
serializer_class = UserGroupSerializer
|
||||
|
|
|
@ -12,8 +12,8 @@ __all__ = ['UserUserGroupRelationViewSet']
|
|||
|
||||
|
||||
class UserUserGroupRelationViewSet(JMSBulkRelationModelViewSet):
|
||||
filter_fields = ('user', 'usergroup')
|
||||
search_fields = filter_fields
|
||||
filterset_fields = ('user', 'usergroup')
|
||||
search_fields = filterset_fields
|
||||
serializer_class = serializers.UserUserGroupRelationSerializer
|
||||
permission_classes = (IsOrgAdmin,)
|
||||
m2m_field = User.groups.field
|
||||
|
|
|
@ -32,8 +32,11 @@ __all__ = [
|
|||
|
||||
|
||||
class UserViewSet(CommonApiMixin, UserQuerysetMixin, BulkModelViewSet):
|
||||
filter_fields = ('username', 'email', 'name', 'id', 'source')
|
||||
search_fields = filter_fields
|
||||
filterset_fields = {
|
||||
'name': ['exact', 'in']
|
||||
}
|
||||
# filterset_fields = ('username', 'email', 'name', 'id', 'source')
|
||||
search_fields = filterset_fields
|
||||
permission_classes = (IsOrgAdmin, CanUpdateDeleteUser)
|
||||
serializer_classes = {
|
||||
'default': UserSerializer,
|
||||
|
|
Loading…
Reference in New Issue