From 3e86c07411682a5213242c69f5871ecd8cdc6f5b Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 12 Jun 2019 17:04:49 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 76615 -> 76651 bytes apps/locale/zh/LC_MESSAGES/django.po | 53 ++++++++++++------------ apps/perms/api/user_group_permission.py | 7 +++- apps/perms/api/user_permission.py | 14 +++++-- apps/perms/const.py | 2 + apps/perms/utils/asset_permission.py | 53 +++++++++++++++++------- 7 files changed, 83 insertions(+), 48 deletions(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index ea3fd70f5..7f7487f06 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -37,7 +37,7 @@ class Node(OrgModelMixin): def __eq__(self, other): if not other: return False - return self.key == other.key + return self.id == other.id def __gt__(self, other): if self.is_root() and not other.is_root(): diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index d1d1a34cb0fde8ec77331e779f14f972c4d77ed9..e0ec647a877fcb69f447961fe4ea4a1a83baeb69 100644 GIT binary patch delta 16772 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 86481fbc4..9251559a9 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-11 11:39+0800\n" +"POT-Creation-Date: 2019-06-12 16:59+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -110,7 +110,7 @@ msgstr "资产" #: applications/templates/applications/remote_app_detail.html:61 #: applications/templates/applications/remote_app_list.html:23 #: applications/templates/applications/user_remote_app_list.html:19 -#: assets/models/user.py:247 assets/templates/assets/user_asset_list.html:168 +#: assets/models/user.py:247 assets/templates/assets/user_asset_list.html:172 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:49 #: audits/templates/audits/ftp_log_list.html:72 #: perms/forms/asset_permission.py:52 perms/models/asset_permission.py:39 @@ -271,7 +271,7 @@ msgstr "创建日期" #: assets/templates/assets/domain_list.html:28 #: assets/templates/assets/system_user_detail.html:104 #: assets/templates/assets/system_user_list.html:59 -#: assets/templates/assets/user_asset_list.html:171 ops/models/adhoc.py:43 +#: assets/templates/assets/user_asset_list.html:175 ops/models/adhoc.py:43 #: orgs/models.py:17 perms/models/asset_permission.py:64 #: perms/models/base.py:43 #: perms/templates/perms/asset_permission_detail.html:102 @@ -563,8 +563,8 @@ msgstr "连接" #: assets/views/admin_user.py:29 assets/views/admin_user.py:47 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78 #: assets/views/admin_user.py:102 assets/views/asset.py:53 -#: assets/views/asset.py:69 assets/views/asset.py:106 assets/views/asset.py:147 -#: assets/views/asset.py:164 assets/views/asset.py:188 +#: assets/views/asset.py:69 assets/views/asset.py:107 assets/views/asset.py:148 +#: assets/views/asset.py:165 assets/views/asset.py:189 #: assets/views/cmd_filter.py:30 assets/views/cmd_filter.py:46 #: assets/views/cmd_filter.py:62 assets/views/cmd_filter.py:78 #: assets/views/cmd_filter.py:97 assets/views/cmd_filter.py:130 @@ -643,7 +643,7 @@ msgstr "标签" #: assets/forms/asset.py:37 assets/forms/asset.py:73 assets/models/asset.py:79 #: assets/models/domain.py:26 assets/models/domain.py:52 #: assets/templates/assets/asset_detail.html:84 -#: assets/templates/assets/user_asset_list.html:169 +#: assets/templates/assets/user_asset_list.html:173 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 msgid "Domain" msgstr "网域" @@ -807,7 +807,7 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" #: assets/templates/assets/domain_gateway_list.html:68 #: assets/templates/assets/system_user_asset.html:51 #: assets/templates/assets/user_asset_list.html:45 -#: assets/templates/assets/user_asset_list.html:163 +#: assets/templates/assets/user_asset_list.html:167 #: audits/templates/audits/login_log_list.html:54 #: perms/templates/perms/asset_permission_asset.html:55 settings/forms.py:133 #: users/templates/users/user_granted_asset.html:45 @@ -824,7 +824,7 @@ msgstr "IP" #: assets/templates/assets/asset_list.html:104 #: assets/templates/assets/system_user_asset.html:50 #: assets/templates/assets/user_asset_list.html:44 -#: assets/templates/assets/user_asset_list.html:162 +#: assets/templates/assets/user_asset_list.html:166 #: perms/templates/perms/asset_permission_asset.html:54 #: perms/templates/perms/asset_permission_list.html:77 settings/forms.py:132 #: users/templates/users/user_granted_asset.html:44 @@ -838,7 +838,7 @@ msgstr "主机名" #: assets/templates/assets/domain_gateway_list.html:70 #: assets/templates/assets/system_user_detail.html:70 #: assets/templates/assets/system_user_list.html:53 -#: assets/templates/assets/user_asset_list.html:165 +#: assets/templates/assets/user_asset_list.html:169 #: terminal/templates/terminal/session_list.html:75 msgid "Protocol" msgstr "协议" @@ -848,20 +848,20 @@ msgstr "协议" #: assets/templates/assets/asset_detail.html:72 #: assets/templates/assets/domain_gateway_list.html:69 #: assets/templates/assets/system_user_asset.html:52 -#: assets/templates/assets/user_asset_list.html:164 +#: assets/templates/assets/user_asset_list.html:168 #: settings/templates/settings/replay_storage_create.html:59 msgid "Port" msgstr "端口" #: assets/models/asset.py:78 assets/templates/assets/asset_detail.html:108 -#: assets/templates/assets/user_asset_list.html:166 +#: assets/templates/assets/user_asset_list.html:170 msgid "Platform" msgstr "系统平台" #: assets/models/asset.py:81 assets/models/cmd_filter.py:21 #: assets/models/domain.py:54 assets/models/label.py:22 #: assets/templates/assets/asset_detail.html:116 -#: assets/templates/assets/user_asset_list.html:170 +#: assets/templates/assets/user_asset_list.html:174 msgid "Is active" msgstr "激活" @@ -915,7 +915,7 @@ msgid "Disk info" msgstr "硬盘信息" #: assets/models/asset.py:103 assets/templates/assets/asset_detail.html:112 -#: assets/templates/assets/user_asset_list.html:167 +#: assets/templates/assets/user_asset_list.html:171 msgid "OS" msgstr "操作系统" @@ -1015,6 +1015,7 @@ msgid "Operator" msgstr "运营商" #: assets/models/cluster.py:36 assets/models/group.py:34 +#: perms/utils/asset_permission.py:63 msgid "Default" msgstr "默认" @@ -1160,7 +1161,7 @@ msgstr "分类" msgid "Key" msgstr "键" -#: assets/models/node.py:133 +#: assets/models/node.py:139 msgid "New node" msgstr "新节点" @@ -1475,7 +1476,7 @@ msgstr "更新系统用户" #: assets/templates/assets/_user_asset_detail_modal.html:11 #: assets/templates/assets/asset_asset_user_list.html:13 -#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:189 +#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:190 msgid "Asset detail" msgstr "资产详情" @@ -1695,7 +1696,7 @@ msgstr "" "左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，" "右侧是属于该节点下的资产" -#: assets/templates/assets/asset_list.html:69 assets/views/asset.py:107 +#: assets/templates/assets/asset_list.html:69 assets/views/asset.py:108 msgid "Create asset" msgstr "创建资产" @@ -2042,19 +2043,19 @@ msgstr "管理用户详情" msgid "My assets" msgstr "我的资产" -#: assets/views/asset.py:121 +#: assets/views/asset.py:122 msgid "Bulk update asset success" msgstr "批量更新资产成功" -#: assets/views/asset.py:148 +#: assets/views/asset.py:149 msgid "Bulk update asset" msgstr "批量更新资产" -#: assets/views/asset.py:165 +#: assets/views/asset.py:166 msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:306 +#: assets/views/asset.py:307 msgid "already exists" msgstr "已经存在" @@ -2961,7 +2962,7 @@ msgstr "执行历史" msgid "Command execution list" msgstr "命令执行列表" -#: ops/views/command.py:69 templates/_nav_user.html:21 +#: ops/views/command.py:69 templates/_nav_user.html:22 msgid "Command execution" msgstr "命令执行" @@ -3778,7 +3779,7 @@ msgstr "文档" msgid "Commercial support" msgstr "商业支持" -#: templates/_header_bar.html:89 templates/_nav_user.html:26 users/forms.py:138 +#: templates/_header_bar.html:89 templates/_nav_user.html:28 users/forms.py:138 #: users/templates/users/_user.html:43 #: users/templates/users/first_login.html:39 #: users/templates/users/user_password_update.html:40 @@ -3913,11 +3914,11 @@ msgstr "历史会话" msgid "Commands" msgstr "命令记录" -#: templates/_nav.html:63 templates/_nav_user.html:31 +#: templates/_nav.html:63 templates/_nav_user.html:33 msgid "Web terminal" msgstr "Web终端" -#: templates/_nav.html:68 templates/_nav_user.html:36 +#: templates/_nav.html:68 templates/_nav_user.html:38 msgid "File manager" msgstr "文件管理" @@ -4331,11 +4332,11 @@ msgid "" "You should use your ssh client tools connect terminal: {}

{}" msgstr "你可以使用ssh客户端工具连接终端" -#: users/api/user.py:75 users/api/user.py:86 users/api/user.py:112 +#: users/api/user.py:78 users/api/user.py:89 users/api/user.py:115 msgid "You do not have permission." msgstr "你没有权限" -#: users/api/user.py:216 +#: users/api/user.py:219 msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" diff --git a/apps/perms/api/user_group_permission.py b/apps/perms/api/user_group_permission.py index 4e5c8acd9..159f76a39 100644 --- a/apps/perms/api/user_group_permission.py +++ b/apps/perms/api/user_group_permission.py @@ -17,7 +17,7 @@ from ..hands import ( AssetGrantedSerializer, UserGroup, Node, NodeSerializer, RemoteAppSerializer, ) -from .. import serializers +from .. import serializers, const __all__ = [ @@ -134,8 +134,11 @@ class UserGroupGrantedNodeAssetsApi(ListAPIView): node_id = self.kwargs.get('node_id') user_group = get_object_or_404(UserGroup, id=user_group_id) - node = get_object_or_404(Node, id=node_id) util = AssetPermissionUtil(user_group) + if str(node_id) == const.UNGROUPED_NODE_ID: + node = util.tree.ungrouped_node + else: + node = get_object_or_404(Node, id=node_id) nodes = util.get_nodes_with_assets() assets = nodes.get(node, []) for asset, system_users in assets.items(): diff --git a/apps/perms/api/user_permission.py b/apps/perms/api/user_permission.py index 377bd735c..b4f8fc07e 100644 --- a/apps/perms/api/user_permission.py +++ b/apps/perms/api/user_permission.py @@ -24,7 +24,7 @@ from ..hands import ( User, Asset, Node, SystemUser, RemoteApp, AssetGrantedSerializer, NodeSerializer, RemoteAppSerializer, ) -from .. import serializers +from .. import serializers, const from ..mixins import AssetsFilterMixin, RemoteAppFilterMixin from ..models import Action @@ -300,9 +300,15 @@ class UserGrantedNodeAssetsApi(UserPermissionCacheMixin, AssetsFilterMixin, List user = self.get_object() node_id = self.kwargs.get('node_id') util = AssetPermissionUtil(user, cache_policy=self.cache_policy) - node = get_object_or_404(Node, id=node_id) - nodes = util.get_nodes_with_assets() - assets = nodes.get(node, []) + if str(node_id) == const.UNGROUPED_NODE_ID: + node = util.tree.ungrouped_node + else: + node = get_object_or_404(Node, id=node_id) + if node == util.tree.root_node: + assets = util.get_assets() + else: + nodes = util.get_nodes_with_assets() + assets = nodes.get(node, []) for asset, system_users in assets.items(): asset.system_users_granted = system_users diff --git a/apps/perms/const.py b/apps/perms/const.py index 4dc315c06..457db580c 100644 --- a/apps/perms/const.py +++ b/apps/perms/const.py @@ -20,3 +20,5 @@ PERMS_ACTION_NAME_CHOICES = ( (PERMS_ACTION_NAME_UPLOAD_FILE, _('Upload file')), (PERMS_ACTION_NAME_DOWNLOAD_FILE, _('Download file')), ) + +UNGROUPED_NODE_ID = "00000000-0000-0000-0000-000000000000" diff --git a/apps/perms/utils/asset_permission.py b/apps/perms/utils/asset_permission.py index 90fd68569..ed9f8f1a3 100644 --- a/apps/perms/utils/asset_permission.py +++ b/apps/perms/utils/asset_permission.py @@ -9,11 +9,13 @@ from django.utils import timezone from django.db.models import Q from django.core.cache import cache from django.conf import settings +from django.utils.translation import ugettext as _ from common.utils import get_logger from common.tree import TreeNode -from perms.models import AssetPermission, Action -from perms.hands import Node +from .. import const +from ..models import AssetPermission, Action +from ..hands import Node logger = get_logger(__file__) @@ -34,24 +36,43 @@ class GenerateTree: """ self.__all_nodes = list(Node.objects.all()) self.nodes = defaultdict(dict) + self.direct_nodes = [] + self._root_node = None + self._ungroup_node = None + + @property + def root_node(self): + if self._root_node: + return self._root_node + all_nodes = self.nodes.keys() + # 如果没有授权节点，就放到默认的根节点下 + if not all_nodes: + root_node = Node.root() + self.add_node(root_node) + else: + root_node = max(all_nodes) + self._root_node = root_node + return root_node + + @property + def ungrouped_node(self): + if self._ungroup_node: + return self._ungroup_node + node_id = const.UNGROUPED_NODE_ID + node_key = self.root_node.get_next_child_key() + node_value = _("Default") + node = Node(id=node_id, key=node_key, value=node_value) + self.add_node(node) + self._ungroup_node = node + return node def add_asset(self, asset, system_users): nodes = asset.nodes.all() - in_nodes = False - for node in nodes: - if node not in self.nodes: - continue + in_nodes = set(self.direct_nodes) & set(nodes) + for node in in_nodes: self.nodes[node][asset].update(system_users) - in_nodes = True if not in_nodes: - all_nodes = self.nodes.keys() - # 如果没有授权节点，就放到默认的根节点下 - if not all_nodes: - root_node = Node.root() - self.add_node(root_node) - else: - root_node = max(all_nodes) - self.nodes[root_node][asset].update(system_users) + self.nodes[self.ungrouped_node][asset].update(system_users) def get_nodes(self): for node in self.nodes: @@ -80,6 +101,8 @@ class GenerateTree: for node in nodes: self.add_node(node) self.add_nodes(node.get_all_children(with_self=False)) + # 如果是直接授权的节点，则放到direct_nodes中 + self.direct_nodes.append(node) def get_user_permissions(user, include_group=True):