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

Fix rbac (#7737)

Browse Source 
* perf: 修改 rbac role bingding

* fix: suggestion perm

* perf: 修改 requirements

* perf: 修改 rbac

* fix: auditor_perms

Co-authored-by: feng626 <1304903146@qq.com>
This commit is contained in:
老广
2022-03-04 10:16:21 +08:00
committed by GitHub
parent 390b8693df
commit 3f9f9351f3
12 changed files with 85 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/rbac/tree.py
View File

@@ -126,12 +126,12 @@ extra_nodes_data = [
},
{
"id": "terminal_node",
"name": _("Terminal"),
"name": _("Terminal setting"),
"pId": "view_setting"
}
]
special_pid_mapper = {
special_model_pid_mapper = {
'common.permission': 'view_other',
"assets.authbook": "accounts",
"applications.account": "accounts",
@@ -159,6 +159,14 @@ special_pid_mapper = {
'terminal.task': 'terminal_node',
}
model_verbose_name_mapper = {
'orgs.organization': _("App organizations"),
}
xpack_required = [
'accounts', 'rbac.'
]
class PermissionTreeUtil:
get_permissions: Callable
@@ -198,6 +206,8 @@ class PermissionTreeUtil:
}
total_count = self.total_counts[app]
checked_count = self.checked_counts[app]
if total_count == 0:
continue
self.total_counts[view] += total_count
self.checked_counts[view] += checked_count
node = self._create_node(
@@ -238,14 +248,18 @@ class PermissionTreeUtil:
continue
model_id = '{}.{}'.format(ct.app_label, ct.model)
# 获取 pid
app = ct.app_label
if special_pid_mapper.get(model_id):
app = special_pid_mapper[model_id]
if special_model_pid_mapper.get(model_id):
app = special_model_pid_mapper[model_id]
self.total_counts[app] += total_count
self.checked_counts[app] += checked_count
# 获取 name
name = f'{ct.name}'
if model_verbose_name_mapper.get(model_id):
name = model_verbose_name_mapper[model_id]
node = self._create_node({
'id': model_id,
'name': name,
@@ -354,6 +368,8 @@ class PermissionTreeUtil:
}
total_count = self.total_counts[view]
checked_count = self.checked_counts[view]
if total_count == 0:
continue
node = self._create_node(data, total_count, checked_count, 'view')
nodes.append(node)
return nodes
@@ -365,6 +381,8 @@ class PermissionTreeUtil:
pid = data['pId']
checked_count = self.checked_counts[i]
total_count = self.total_counts[i]
if total_count == 0:
continue
self.total_counts[pid] += total_count
self.checked_counts[pid] += checked_count
node = self._create_node(