mirror of https://github.com/jumpserver/jumpserver
fix: 优化命令告警，不增加跳转链接
Bai
Bryan
parent
fa52e2bf5e
commit
ea607c6177
|
|
@ -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 "
|
||||
|
|
|
|||
|
|
@ -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 "
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -1,23 +1,25 @@
|
|||
{% load i18n %}
|
||||
|
||||
<div>
|
||||
<b>{% trans 'Asset' %}: </b> <a href="{{ asset_url }}" target="_blank">{{ asset }}</a><br />
|
||||
<b>{% trans 'User' %}: </b> <a href="{{ user_url }}" target="_blank">{{ user }}</a><br />
|
||||
<b>{% trans 'Account' %}: </b>
|
||||
{% if account_url %}
|
||||
<a href="{{ account_url }}" target="_blank">{{ account }}</a>
|
||||
{% else %}
|
||||
<span>{{ account }}</span>
|
||||
{% endif %}
|
||||
<br />
|
||||
<b>{% trans 'Risk level' %}: </b><span>{{ risk_level }}</span><br />
|
||||
<b>{% trans 'Command acl' %}: </b> <a href="{{ cmd_filter_acl_url }}" target="_blank">{{ user }}</a><br />
|
||||
<b>{% trans 'Command acl group' %}: </b> <a href="{{ cmd_group_url }}" target="_blank">{{ user }}</a><br />
|
||||
<b>{% trans 'Asset' %}: </b> <span>{{ asset }}</span>
|
||||
<br/>
|
||||
<b>{% trans 'User' %}: </b> <span>{{ user }}</span>
|
||||
<br/>
|
||||
<b>{% trans 'Account' %}: </b> <span>{{ account }}</span>
|
||||
<br/>
|
||||
<b>{% trans 'Risk level' %}: </b><span>{{ risk_level }}</span>
|
||||
<br/>
|
||||
<b>{% trans 'Command acl' %}: </b> <span>{{ cmd_filter_acl }}</span>
|
||||
<br/>
|
||||
<b>{% trans 'Command group' %}: </b> <span>{{ cmd_group}}</span>
|
||||
<br/>
|
||||
{% if session_url %}
|
||||
<b>{% trans 'Session' %}: </b>
|
||||
<a href="{{ session_url }}" target="_blank">{% trans 'View' %}</a><br />
|
||||
<a href="{{ session_url }}" target="_blank">{% trans 'View' %}</a>
|
||||
<br/>
|
||||
{% endif %}
|
||||
<b>{% trans 'Organization' %}: </b> <span>{{ org }}</span><br />
|
||||
<b>{% trans 'Command' %}: </b><span>{{ command }}</span><br />
|
||||
|
||||
<b>{% trans 'Organization' %}: </b> <span>{{ org }}</span>
|
||||
<br/>
|
||||
<b>{% trans 'Command' %}: </b><span>{{ command }}</span>
|
||||
<br/>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue