github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-30 16:52:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改获取系统用户认证信息时username的选择逻辑；（单独设置过的系统用户认证信息登录资产失败）

Browse Source
This commit is contained in:
Bai 2021-06-18 18:10:04 +08:00 committed by Jiangjie.Bai
parent b5120e72c8
commit dabc9eb09b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/assets/models/user.py
View File

@ -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