diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 8d6cba4c3..f9a420832 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -6399,11 +6399,6 @@ msgstr "アイテム" msgid "Url" msgstr "リンク" -#: terminal/templates/terminal/_msg_command_warning.html:60 -#: terminal/templates/terminal/_msg_command_warning.html:93 -msgid "Command acl group" -msgstr "コマンドフィルタリンググループ" - #: terminal/utils/db_port_mapper.py:84 msgid "" "No available port is matched. The number of databases may have exceeded the " diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 2938bb022..46c564887 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -6307,11 +6307,6 @@ msgstr "项目" msgid "Url" msgstr "链接" -#: terminal/templates/terminal/_msg_command_warning.html:60 -#: terminal/templates/terminal/_msg_command_warning.html:93 -msgid "Command acl group" -msgstr "命令过滤组" - #: terminal/utils/db_port_mapper.py:84 msgid "" "No available port is matched. The number of databases may have exceeded the " diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index 6431780a3..06a858bd6 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -409,8 +409,6 @@ class JobExecution(JMSOrgBaseModel): 'cmd_group': str(cg.id), 'risk_level': RiskLevelChoices.warning, 'org_id': self.org_id, - '_user_id': self.creator.id, - '_asset_id': asset.id, '_account': self.current_job.runas, '_cmd_filter_acl': acl, '_cmd_group': cg, diff --git a/apps/terminal/api/session/command.py b/apps/terminal/api/session/command.py index f95155fd1..4d20d345c 100644 --- a/apps/terminal/api/session/command.py +++ b/apps/terminal/api/session/command.py @@ -226,10 +226,7 @@ class InsecureCommandAlertAPI(generics.CreateAPIView): if session: command.update({ - '_user_id': session.user_id, - '_asset_id': session.asset_id, '_account': session.account, - '_account_id': session.account_id, '_org_name': session.org.name, }) diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index 6d49946dd..cfcac4396 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -80,11 +80,8 @@ class CommandWarningMessage(CommandAlertMixin, UserMessage): command_input = command['input'] user = command['user'] - user_id = command.get('_user_id', '') asset = command['asset'] - asset_id = command.get('_asset_id', '') account = command.get('_account', '') - account_id = command.get('_account_id', '') cmd_acl = command.get('_cmd_filter_acl') cmd_group = command.get('_cmd_group') session_id = command.get('session', '') @@ -92,51 +89,29 @@ class CommandWarningMessage(CommandAlertMixin, UserMessage): org_id = command['org_id'] org_name = command.get('_org_name') or org_id - user_url = asset_url = account_url = session_url = '' - if user_id: - user_url = reverse( - 'users:user-detail', kwargs={'pk': user_id}, - api_to_ui=True, external=True, is_console=True - ) + '?oid={}'.format(org_id) - if asset_id: - asset_url = reverse( - 'assets:asset-detail', kwargs={'pk': asset_id}, - api_to_ui=True, external=True, is_console=True - ) + '?oid={}'.format(org_id) - if account_id: - account_url = reverse( - 'accounts:account-detail', kwargs={'pk': account_id}, - api_to_ui=True, external=True, is_console=True - ) + '?oid={}'.format(org_id) if session_id: session_url = reverse( 'api-terminal:session-detail', kwargs={'pk': session_id}, external=True, api_to_ui=True ) + '?oid={}'.format(org_id) session_url = session_url.replace('/terminal/sessions/', '/audit/sessions/sessions/') + else: + session_url = '' # Command ACL - cmd_acl_url = cmd_group_url = '' cmd_acl_name = cmd_group_name = '' if cmd_acl: cmd_acl_name = cmd_acl.name - cmd_acl_url = settings.SITE_URL + f'/ui/#/console/perms/cmd-acls/{cmd_acl.id}/' if cmd_group: cmd_group_name = cmd_group.name - cmd_group_url = settings.SITE_URL + f'/ui/#/console/perms/cmd-groups/{cmd_group.id}/' context = { 'command': command_input, 'user': user, - 'user_url': user_url, 'asset': asset, - 'asset_url': asset_url, 'account': account, - 'account_url': account_url, 'cmd_filter_acl': cmd_acl_name, - 'cmd_filter_acl_url': cmd_acl_url, 'cmd_group': cmd_group_name, - 'cmd_group_url': cmd_group_url, 'session_url': session_url, 'risk_level': RiskLevelChoices.get_label(risk_level), 'org': org_name, diff --git a/apps/terminal/templates/terminal/_msg_command_warning.html b/apps/terminal/templates/terminal/_msg_command_warning.html index 23469e3a4..df7315341 100644 --- a/apps/terminal/templates/terminal/_msg_command_warning.html +++ b/apps/terminal/templates/terminal/_msg_command_warning.html @@ -1,23 +1,25 @@ {% load i18n %}
- {% trans 'Asset' %}: {{ asset }}
- {% trans 'User' %}: {{ user }}
- {% trans 'Account' %}: - {% if account_url %} - {{ account }} - {% else %} - {{ account }} - {% endif %} -
- {% trans 'Risk level' %}: {{ risk_level }}
- {% trans 'Command acl' %}: {{ user }}
- {% trans 'Command acl group' %}: {{ user }}
+ {% trans 'Asset' %}: {{ asset }} +
+ {% trans 'User' %}: {{ user }} +
+ {% trans 'Account' %}: {{ account }} +
+ {% trans 'Risk level' %}: {{ risk_level }} +
+ {% trans 'Command acl' %}: {{ cmd_filter_acl }} +
+ {% trans 'Command group' %}: {{ cmd_group}} +
{% if session_url %} {% trans 'Session' %}: - {% trans 'View' %}
+ {% trans 'View' %} +
{% endif %} - {% trans 'Organization' %}: {{ org }}
- {% trans 'Command' %}: {{ command }}
- + {% trans 'Organization' %}: {{ org }} +
+ {% trans 'Command' %}: {{ command }} +