diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index 0d7a42454..15b9ec75f 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -74,7 +74,7 @@ class AssetPlatformViewSet(ModelViewSet): queryset = Platform.objects.all() permission_classes = (IsSuperUser,) serializer_class = serializers.PlatformSerializer - filterset_fields = ['name', 'base'] + filter_fields = ['name', 'base'] search_fields = ['name'] def check_object_permissions(self, request, obj): diff --git a/apps/assets/api/system_user_relation.py b/apps/assets/api/system_user_relation.py index 69605b74a..bffa283ec 100644 --- a/apps/assets/api/system_user_relation.py +++ b/apps/assets/api/system_user_relation.py @@ -65,7 +65,7 @@ class SystemUserAssetRelationViewSet(BaseRelationViewSet): serializer_class = serializers.SystemUserAssetRelationSerializer model = models.SystemUser.assets.through permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_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,) - filterset_fields = [ + filter_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,) - filterset_fields = [ + filter_fields = [ 'id', 'user', 'systemuser', ] search_fields = [ diff --git a/apps/audits/api.py b/apps/audits/api.py index 564fdbb81..ecfc7f1d1 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -24,12 +24,11 @@ class FTPLogViewSet(ListModelMixin, OrgGenericViewSet): date_range_filter_fields = [ ('date_start', ('date_from', 'date_to')) ] - filter_fields = ['user', 'asset', 'system_user'] - search_fields = ['filename'] + filter_fields = ['user', 'asset', 'system_user', 'filename'] + search_fields = filter_fields -class UserLoginLogViewSet(ListModelMixin, - CommonGenericViewSet): +class UserLoginLogViewSet(ListModelMixin, CommonGenericViewSet): queryset = UserLoginLog.objects.all() permission_classes = [IsOrgAdmin | IsOrgAuditor] serializer_class = UserLoginLogSerializer @@ -61,7 +60,7 @@ class OperateLogViewSet(ListModelMixin, OrgGenericViewSet): date_range_filter_fields = [ ('datetime', ('date_from', 'date_to')) ] - filter_fields = ['user', 'action', 'resource_type', 'resource'] + filter_fields = ['user', 'action', 'resource_type', 'resource', 'remote_addr'] search_fields = ['resource'] ordering = ['-datetime'] @@ -74,7 +73,7 @@ class PasswordChangeLogViewSet(ListModelMixin, CommonGenericViewSet): date_range_filter_fields = [ ('datetime', ('date_from', 'date_to')) ] - filterset_fields = ['user'] + filter_fields = ['user', 'change_by', 'remote_addr'] ordering = ['-datetime'] def get_queryset(self): diff --git a/apps/perms/api/asset_permission_relation.py b/apps/perms/api/asset_permission_relation.py index 3b68af775..4207a995c 100644 --- a/apps/perms/api/asset_permission_relation.py +++ b/apps/perms/api/asset_permission_relation.py @@ -33,7 +33,7 @@ class AssetPermissionUserRelationViewSet(RelationMixin): serializer_class = serializers.AssetPermissionUserRelationSerializer model = models.AssetPermission.users.through permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', "user", "assetpermission", ] search_fields = ("user__name", "user__username", "assetpermission__name") @@ -64,7 +64,7 @@ class AssetPermissionUserGroupRelationViewSet(RelationMixin): serializer_class = serializers.AssetPermissionUserGroupRelationSerializer model = models.AssetPermission.user_groups.through permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', "usergroup", "assetpermission" ] search_fields = ["usergroup__name", "assetpermission__name"] @@ -80,7 +80,7 @@ class AssetPermissionAssetRelationViewSet(RelationMixin): serializer_class = serializers.AssetPermissionAssetRelationSerializer model = models.AssetPermission.assets.through permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'asset', 'assetpermission', ] search_fields = ["id", "asset__hostname", "asset__ip", "assetpermission__name"] @@ -111,7 +111,7 @@ class AssetPermissionNodeRelationViewSet(RelationMixin): serializer_class = serializers.AssetPermissionNodeRelationSerializer model = models.AssetPermission.nodes.through permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'node', 'assetpermission', ] search_fields = ["node__value", "assetpermission__name"] @@ -127,7 +127,7 @@ class AssetPermissionSystemUserRelationViewSet(RelationMixin): serializer_class = serializers.AssetPermissionSystemUserRelationSerializer model = models.AssetPermission.system_users.through permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'systemuser', 'assetpermission', ] search_fields = [ diff --git a/apps/perms/api/database_app_permission_relation.py b/apps/perms/api/database_app_permission_relation.py index 887b723dd..572896e34 100644 --- a/apps/perms/api/database_app_permission_relation.py +++ b/apps/perms/api/database_app_permission_relation.py @@ -23,7 +23,7 @@ class DatabaseAppPermissionUserRelationViewSet(RelationViewSet): serializer_class = serializers.DatabaseAppPermissionUserRelationSerializer m2m_field = models.DatabaseAppPermission.users.field permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'user', 'databaseapppermission' ] search_fields = ('user__name', 'user__username', 'databaseapppermission__name') @@ -38,7 +38,7 @@ class DatabaseAppPermissionUserGroupRelationViewSet(RelationViewSet): serializer_class = serializers.DatabaseAppPermissionUserGroupRelationSerializer m2m_field = models.DatabaseAppPermission.user_groups.field permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', "usergroup", "databaseapppermission" ] search_fields = ["usergroup__name", "databaseapppermission__name"] @@ -69,7 +69,7 @@ class DatabaseAppPermissionDatabaseAppRelationViewSet(RelationViewSet): serializer_class = serializers.DatabaseAppPermissionDatabaseAppRelationSerializer m2m_field = models.DatabaseAppPermission.database_apps.field permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'databaseapp', 'databaseapppermission', ] search_fields = [ @@ -102,7 +102,7 @@ class DatabaseAppPermissionSystemUserRelationViewSet(RelationViewSet): serializer_class = serializers.DatabaseAppPermissionSystemUserRelationSerializer m2m_field = models.DatabaseAppPermission.system_users.field permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'systemuser', 'databaseapppermission' ] search_fields = [ diff --git a/apps/perms/api/remote_app_permission_relation.py b/apps/perms/api/remote_app_permission_relation.py index 5cbb7dbf9..fe0ab7355 100644 --- a/apps/perms/api/remote_app_permission_relation.py +++ b/apps/perms/api/remote_app_permission_relation.py @@ -35,7 +35,7 @@ class RemoteAppPermissionUserRelationViewSet(RelationViewSet): serializer_class = serializers.RemoteAppPermissionUserRelationSerializer m2m_field = models.RemoteAppPermission.users.field permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'user', 'remoteapppermission' ] search_fields = ('user__name', 'user__username', 'remoteapppermission__name') @@ -50,7 +50,7 @@ class RemoteAppPermissionRemoteAppRelationViewSet(RelationViewSet): serializer_class = serializers.RemoteAppPermissionRemoteAppRelationSerializer m2m_field = models.RemoteAppPermission.remote_apps.field permission_classes = (IsOrgAdmin,) - filterset_fields = [ + filter_fields = [ 'id', 'remoteapp', 'remoteapppermission', ] search_fields = [ diff --git a/apps/terminal/api/session.py b/apps/terminal/api/session.py index d2365bef0..8cbf4daa8 100644 --- a/apps/terminal/api/session.py +++ b/apps/terminal/api/session.py @@ -32,7 +32,7 @@ class SessionViewSet(OrgBulkModelViewSet): 'display': serializers.SessionDisplaySerializer, } permission_classes = (IsOrgAdminOrAppUser, ) - filterset_fields = [ + filter_fields = [ "user", "asset", "system_user", "remote_addr", "protocol", "terminal", "is_finished", ] diff --git a/apps/terminal/serializers/session.py b/apps/terminal/serializers/session.py index bed6525b5..65f933351 100644 --- a/apps/terminal/serializers/session.py +++ b/apps/terminal/serializers/session.py @@ -1,5 +1,6 @@ from rest_framework import serializers +from django.utils.translation import ugettext_lazy as _ from orgs.mixins.serializers import BulkOrgResourceModelSerializer from common.serializers import AdaptedBulkListSerializer from ..models import Session @@ -24,6 +25,10 @@ class SessionSerializer(BulkOrgResourceModelSerializer): "can_join", "protocol", "date_start", "date_end", "terminal", ] + extra_kwargs = { + "protocol": {'label': _('Protocol')}, + 'is_finished': {'label': _('Is finished')} + } class SessionDisplaySerializer(SessionSerializer):