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

fix: authbook 没有的值取 systemuser

pull/10687/head
feng 2023-06-08 15:28:43 +08:00 committed by Jiangjie.Bai
parent 4a1f3ed727
commit 4e4e58480f
2 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/asset.py
View File

@ -292,7 +292,7 @@ class Asset(AbsConnectivity, AbsHardwareInfo, ProtocolsMixin, NodesRelationMixin
auth_user = self.admin_user auth_user = self.admin_user
become_user = None become_user = None
auth_user.load_asset_special_auth(self, run_as_admin=True) auth_user.load_asset_special_auth(self)
info = { info = {
'username': auth_user.username, 'username': auth_user.username,
'password': auth_user.password, 'password': auth_user.password,

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

@ -7,7 +7,7 @@ import logging
from django.core.cache import cache from django.core.cache import cache
from django.core.validators import MinValueValidator, MaxValueValidator from django.core.validators import MinValueValidator, MaxValueValidator
from django.db import models from django.db import models
from django.db.models import F, Q from django.db.models import Q
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from common.utils import signer, get_object_or_none, is_uuid from common.utils import signer, get_object_or_none, is_uuid
@ -166,44 +166,7 @@ class AuthMixin:
if asset: if asset:
self.load_asset_more_auth(asset_id=asset.id, username=username, user_id=user_id) self.load_asset_more_auth(asset_id=asset.id, username=username, user_id=user_id)
@staticmethod def load_asset_special_auth(self, asset, username=''):
def _load_run_as_admin_auth(authbook, not_stu_qs, stu_qs):
if not authbook.password:
password_query = not_stu_qs.values('password')
password = next((i['password'] for i in password_query if i['password']), None)
if not password:
password_query = stu_qs.values('password', stu_password=F('systemuser__password'))
password = next(
(
i['password'] or i['stu_password'] for i in password_query if
i['password'] or i['stu_password']
), ''
)
authbook.password = password
elif not authbook.private_key:
key_query = not_stu_qs.values('private_key', 'public_key')
key_data = next((i for i in key_query if i['private_key']), None)
if not key_data:
key_query = stu_qs.values(
'private_key', 'public_key',
stu_private_key=F('systemuser__private_key'),
stu_public_key=F('systemuser__public_key')
)
key_data = next(
(
{
'private_key': i['private_key'] or i['stu_private_key'],
'public_key': i['public_key'] or i['stu_public_key']
} for i in key_query if i['private_key'] or i['stu_private_key']
), {'private_key': '', 'public_key': ''}
)
authbook.private_key = key_data['private_key']
authbook.public_key = key_data['public_key']
def load_asset_special_auth(self, asset, username='', run_as_admin=False):
""" """
AuthBook 的数据状态 AuthBook 的数据状态
| asset | systemuser | username | | asset | systemuser | username |
@ -237,12 +200,9 @@ class AuthMixin:
return None return None
authbook.load_auth() authbook.load_auth()
if run_as_admin: self.password = authbook.password or self.password or ''
self._load_run_as_admin_auth(authbook, not_stu_qs, stu_qs) self.private_key = authbook.private_key or self.private_key or ''
self.public_key = authbook.public_key or self.public_key or ''
self.password = authbook.password
self.private_key = authbook.private_key
self.public_key = authbook.public_key
def load_asset_more_auth(self, asset_id=None, username=None, user_id=None): def load_asset_more_auth(self, asset_id=None, username=None, user_id=None):
from users.models import User from users.models import User