github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9669 from jumpserver/pr@dev@fix_ftp_log 

fix: 修复 ftp 审计日志上传失败
pull/9673/head
Eric_Lee 2023-02-21 20:13:08 +08:00 committed by GitHub
parent 0bd674bb9c 31a3e3b177
commit 85dbdd648f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/audits/api.py
View File

@ -10,7 +10,7 @@ from rest_framework.permissions import IsAuthenticated
from common.drf.filters import DatetimeRangeFilter from common.drf.filters import DatetimeRangeFilter
from common.plugins.es import QuerySet as ESQuerySet from common.plugins.es import QuerySet as ESQuerySet
from common.utils import is_uuid from common.utils import is_uuid
from orgs.mixins.api import OrgReadonlyModelViewSet from orgs.mixins.api import OrgReadonlyModelViewSet, OrgModelViewSet
from orgs.utils import current_org, tmp_to_root_org from orgs.utils import current_org, tmp_to_root_org
from users.models import User from users.models import User
from .backends import TYPE_ENGINE_MAPPING from .backends import TYPE_ENGINE_MAPPING
@ -35,7 +35,7 @@ class JobAuditViewSet(OrgReadonlyModelViewSet):
ordering = ['-date_start'] ordering = ['-date_start']
class FTPLogViewSet(OrgReadonlyModelViewSet): class FTPLogViewSet(OrgModelViewSet):
model = FTPLog model = FTPLog
serializer_class = FTPLogSerializer serializer_class = FTPLogSerializer
extra_filter_backends = [DatetimeRangeFilter] extra_filter_backends = [DatetimeRangeFilter]
@ -45,6 +45,7 @@ class FTPLogViewSet(OrgReadonlyModelViewSet):
filterset_fields = ['user', 'asset', 'account', 'filename'] filterset_fields = ['user', 'asset', 'account', 'filename']
search_fields = filterset_fields search_fields = filterset_fields
ordering = ['-date_start'] ordering = ['-date_start']
http_method_names = ['post', 'get', 'head', 'options']
class UserLoginCommonMixin: class UserLoginCommonMixin: