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

perf: 资产acl拒绝后没记录操作日志 (#11868) 

Co-authored-by: feng <1304903146@qq.com>
pull/11869/head
fit2bot 2023-10-17 14:28:19 +08:00 committed by GitHub
parent 741705b85b
commit 73b75df524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/audits/api.py
View File

@ -218,10 +218,10 @@ class OperateLogViewSet(OrgReadonlyModelViewSet):
return super().get_serializer_class() return super().get_serializer_class()
def get_queryset(self): def get_queryset(self):
org_q = Q() qs = OperateLog.objects.all()
if self.is_action_detail: if self.is_action_detail:
org_q |= Q(org_id=Organization.SYSTEM_ID) with tmp_to_root_org():
qs = OperateLog.objects.filter(org_q) qs |= OperateLog.objects.filter(org_id=Organization.SYSTEM_ID)
es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG
if es_config: if es_config:
engine_mod = import_module(TYPE_ENGINE_MAPPING['es']) engine_mod = import_module(TYPE_ENGINE_MAPPING['es'])

2
apps/audits/backends/db.py
View File

@ -58,7 +58,7 @@ class OperateLogStore(object):
return diff_list return diff_list
def save(self, **kwargs): def save(self, **kwargs):
log_id = kwargs.get('id') log_id = kwargs.pop('id', None)
before = kwargs.pop('before') or {} before = kwargs.pop('before') or {}
after = kwargs.pop('after') or {} after = kwargs.pop('after') or {}

8
apps/authentication/api/connection_token.py
View File

@ -432,6 +432,14 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
reviewer, asset, user, input_username reviewer, asset, user, input_username
).publish_async() ).publish_async()
def create(self, request, *args, **kwargs):
try:
response = super().create(request, *args, **kwargs)
except JMSException as e:
data = {'code': e.detail.code, 'detail': e.detail}
return Response(data, status=e.status_code)
return response
class SuperConnectionTokenViewSet(ConnectionTokenViewSet): class SuperConnectionTokenViewSet(ConnectionTokenViewSet):
serializer_classes = { serializer_classes = {