mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-16 09:02:49 +00:00
Compare commits
2 Commits
revert-162
...
v2.11.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a9b7da3a84 | ||
|
|
c047ee0780 |
@@ -248,13 +248,16 @@ class SystemUser(BaseUser):
|
|||||||
if user_id:
|
if user_id:
|
||||||
user = get_object_or_none(User, pk=user_id)
|
user = get_object_or_none(User, pk=user_id)
|
||||||
|
|
||||||
|
_username = self.username
|
||||||
if self.username_same_with_user:
|
if self.username_same_with_user:
|
||||||
if user and not username:
|
if user and not username:
|
||||||
username = user.username
|
_username = user.username
|
||||||
|
else:
|
||||||
|
_username = username
|
||||||
|
|
||||||
# 加载某个资产的特殊配置认证信息
|
# 加载某个资产的特殊配置认证信息
|
||||||
try:
|
try:
|
||||||
self.load_asset_special_auth(asset, username)
|
self.load_asset_special_auth(asset, _username)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error('Load special auth Error: ', e)
|
logger.error('Load special auth Error: ', e)
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -32,14 +32,16 @@ class CommandAlertMixin:
|
|||||||
db_setting = Setting.objects.filter(name='SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER').first()
|
db_setting = Setting.objects.filter(name='SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER').first()
|
||||||
if db_setting:
|
if db_setting:
|
||||||
emails = db_setting.value
|
emails = db_setting.value
|
||||||
emails = emails or settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER
|
else:
|
||||||
|
emails = settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER
|
||||||
emails = emails.split(',')
|
emails = emails.split(',')
|
||||||
emails = [email.strip().strip('"') for email in emails]
|
emails = [email.strip().strip('"') for email in emails]
|
||||||
|
|
||||||
users = User.objects.filter(email__in=emails)
|
users = User.objects.filter(email__in=emails)
|
||||||
subscription.users.add(*users)
|
if users:
|
||||||
subscription.receive_backends = [BACKEND.EMAIL]
|
subscription.users.add(*users)
|
||||||
subscription.save()
|
subscription.receive_backends = [BACKEND.EMAIL]
|
||||||
|
subscription.save()
|
||||||
|
|
||||||
|
|
||||||
class CommandAlertMessage(CommandAlertMixin, SystemMessage):
|
class CommandAlertMessage(CommandAlertMixin, SystemMessage):
|
||||||
|
|||||||
Reference in New Issue
Block a user