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

fix: ticket bug

pull/8475/head
feng626 2022-06-23 18:32:36 +08:00 committed by 老广
parent b264db3e7e
commit 9388f37c39
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/cmd_filter.py
View File

@ -173,7 +173,7 @@ class CommandFilterRule(OrgModelMixin):
'apply_run_user_id': session.user_id, 'apply_run_user_id': session.user_id,
'apply_run_asset_id': session.asset_id, 'apply_run_asset_id': session.asset_id,
'apply_run_system_user_id': session.system_user_id, 'apply_run_system_user_id': session.system_user_id,
'apply_run_command': run_command[:4096], 'apply_run_command': run_command[:4090],
'apply_from_session_id': str(session.id), 'apply_from_session_id': str(session.id),
'apply_from_cmd_filter_rule_id': str(cmd_filter_rule.id), 'apply_from_cmd_filter_rule_id': str(cmd_filter_rule.id),
'apply_from_cmd_filter_id': str(cmd_filter_rule.filter.id), 'apply_from_cmd_filter_id': str(cmd_filter_rule.filter.id),

14
apps/tickets/migrations/0017_auto_20220623_1027.py
View File

@ -240,17 +240,19 @@ def command_confirm_migrate(apps, *args):
tickets = ticket_model.objects.filter(type=TicketType.command_confirm) tickets = ticket_model.objects.filter(type=TicketType.command_confirm)
session_ids = tickets.values_list('meta__apply_from_session_id', flat=True) session_ids = tickets.values_list('meta__apply_from_session_id', flat=True)
session_ids = session_model.objects.filter(id__in=session_ids).values_list('id', flat=True) session_ids = session_model.objects.filter(id__in=list(session_ids)).values_list('id', flat=True)
session_ids = [str(i) for i in session_ids]
command_filter_ids = tickets.values_list('meta__apply_from_cmd_filter_id', flat=True) command_filter_ids = tickets.values_list('meta__apply_from_cmd_filter_id', flat=True)
command_filter_ids = command_filter_model.objects\ command_filter_ids = command_filter_model.objects\
.filter(id__in=command_filter_ids)\ .filter(id__in=list(command_filter_ids))\
.values_list('id', flat=True) .values_list('id', flat=True)
command_filter_ids = [str(i) for i in command_filter_ids]
command_filter_rule_ids = tickets.values_list('meta__apply_from_cmd_filter_rule_id', flat=True) command_filter_rule_ids = tickets.values_list('meta__apply_from_cmd_filter_rule_id', flat=True)
command_filter_rule_ids = command_filter_rule_model.objects\ command_filter_rule_ids = command_filter_rule_model.objects\
.filter(id__in=command_filter_rule_ids)\ .filter(id__in=list(command_filter_rule_ids))\
.values_list('id', flat=True) .values_list('id', flat=True)
command_filter_rule_ids = [str(i) for i in command_filter_rule_ids]
ticket_apply_command_model = apps.get_model('tickets', 'ApplyCommandTicket') ticket_apply_command_model = apps.get_model('tickets', 'ApplyCommandTicket')
for instance in tickets: for instance in tickets:
@ -287,7 +289,7 @@ def command_confirm_migrate(apps, *args):
'apply_run_user': apply_run_user, 'apply_run_user': apply_run_user,
'apply_run_asset': apply_run_asset, 'apply_run_asset': apply_run_asset,
'apply_run_system_user': apply_run_system_user, 'apply_run_system_user': apply_run_system_user,
'apply_run_command': meta.get('apply_run_command', '')[:4096], 'apply_run_command': meta.get('apply_run_command', '')[:4090],
'apply_from_session_id': apply_from_session_id, 'apply_from_session_id': apply_from_session_id,
'apply_from_cmd_filter_id': apply_from_cmd_filter_id, 'apply_from_cmd_filter_id': apply_from_cmd_filter_id,
'apply_from_cmd_filter_rule_id': apply_from_cmd_filter_rule_id, 'apply_from_cmd_filter_rule_id': apply_from_cmd_filter_rule_id,