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

perf: 资产登录提示添加账号信息 (#11826) 

Co-authored-by: feng <1304903146@qq.com>
pull/11827/head
fit2bot 2023-10-12 20:04:28 +08:00 committed by GitHub
parent e1278360af
commit 58fd578ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/acls/notifications.py
View File

@ -41,9 +41,10 @@ class UserLoginReminderMsg(UserMessage):
class AssetLoginReminderMsg(UserMessage): class AssetLoginReminderMsg(UserMessage):
subject = _('Asset login reminder') subject = _('Asset login reminder')
def __init__(self, user, asset: Asset, login_user: User): def __init__(self, user, asset: Asset, login_user: User, account_username):
self.asset = asset self.asset = asset
self.login_user = login_user self.login_user = login_user
self.account_username = account_username
super().__init__(user) super().__init__(user)
def get_html_msg(self) -> dict: def get_html_msg(self) -> dict:
@ -51,6 +52,7 @@ class AssetLoginReminderMsg(UserMessage):
'recipient': self.user.username, 'recipient': self.user.username,
'username': self.login_user.username, 'username': self.login_user.username,
'asset': str(self.asset), 'asset': str(self.asset),
'account': self.account_username,
} }
message = render_to_string('acls/asset_login_reminder.html', context) message = render_to_string('acls/asset_login_reminder.html', context)

1
apps/acls/templates/acls/asset_login_reminder.html
View File

@ -4,6 +4,7 @@
<hr> <hr>
<p><strong>{% trans 'Username' %}:</strong> [{{ username }}]</p> <p><strong>{% trans 'Username' %}:</strong> [{{ username }}]</p>
<p><strong>{% trans 'Assets' %}:</strong> [{{ asset }}]</p> <p><strong>{% trans 'Assets' %}:</strong> [{{ asset }}]</p>
<p><strong>{% trans 'Account' %}:</strong> [{{ account }}]</p>
<hr> <hr>
<p>{% trans 'The user has just successfully logged into the asset. Please ensure that this is an authorized operation. If you suspect that this is an unauthorized access, please take appropriate measures immediately.' %}</p> <p>{% trans 'The user has just successfully logged into the asset. Please ensure that this is an authorized operation. If you suspect that this is an unauthorized access, please take appropriate measures immediately.' %}</p>

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

@ -419,9 +419,10 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
reviewers = acl.reviewers.all() reviewers = acl.reviewers.all()
if not reviewers: if not reviewers:
return return
account_username = account.username
self._record_operate_log(acl, asset) self._record_operate_log(acl, asset)
for reviewer in reviewers: for reviewer in reviewers:
AssetLoginReminderMsg(reviewer, asset, user).publish_async() AssetLoginReminderMsg(reviewer, asset, user, account_username).publish_async()
class SuperConnectionTokenViewSet(ConnectionTokenViewSet): class SuperConnectionTokenViewSet(ConnectionTokenViewSet):