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

perf: 修复社区版可能引起的问题

pull/9742/head
ibuler 2023-02-24 00:04:53 +08:00 committed by Jiangjie.Bai
parent d1eacf53d4
commit adbe7c07c6
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,7 +489,7 @@ class SomeNodesMixin:
return cls.default_node() return cls.default_node()
if ori_org and ori_org.is_root(): if ori_org and ori_org.is_root():
return None return cls.default_node()
org_roots = cls.org_root_nodes() org_roots = cls.org_root_nodes()
org_roots_length = len(org_roots) org_roots_length = len(org_roots)

10
apps/perms/utils/account.py
View File

@ -1,5 +1,6 @@
from collections import defaultdict from collections import defaultdict
from orgs.utils import tmp_to_org
from accounts.models import Account from accounts.models import Account
from accounts.const import AliasAccount from accounts.const import AliasAccount
from .permission import AssetPermissionUtil from .permission import AssetPermissionUtil
@ -16,10 +17,11 @@ class PermAccountUtil(AssetPermissionUtil):
:param asset: Asset :param asset: Asset
:param account_name: 可能是 @USER @INPUT 字符串 :param account_name: 可能是 @USER @INPUT 字符串
""" """
permed_accounts = self.get_permed_accounts_for_user(user, asset) with tmp_to_org(asset.org):
accounts_mapper = {account.alias: account for account in permed_accounts} permed_accounts = self.get_permed_accounts_for_user(user, asset)
account = accounts_mapper.get(account_name) accounts_mapper = {account.alias: account for account in permed_accounts}
return account account = accounts_mapper.get(account_name)
return account
def get_permed_accounts_for_user(self, user, asset): def get_permed_accounts_for_user(self, user, asset):
""" 获取授权给用户某个资产的账号 """ """ 获取授权给用户某个资产的账号 """

6
apps/rbac/permissions.py
View File

@ -97,13 +97,13 @@ class RBACPermission(permissions.DjangoModelPermissions):
else: else:
model_cls = queryset.model model_cls = queryset.model
except AssertionError as e: except AssertionError as e:
logger.error(f'Error get model cls: {e}') # logger.error(f'Error get model cls: {e}')
model_cls = None model_cls = None
except AttributeError as e: except AttributeError as e:
logger.error(f'Error get model cls: {e}') # logger.error(f'Error get model cls: {e}')
model_cls = None model_cls = None
except Exception as e: except Exception as e:
logger.error('Error get model class: {} of {}'.format(e, view)) # logger.error('Error get model class: {} of {}'.format(e, view))
raise e raise e
return model_cls return model_cls