fix: fix rbac to dev (#7636)

* feat: 添加 RBAC 应用模块

* feat: 添加 RBAC Model、API

* feat: 添加 RBAC Model、API 2

* feat: 添加 RBAC Model、API 3

* feat: 添加 RBAC Model、API 4

* feat: RBAC

* feat: RBAC

* feat: RBAC

* feat: RBAC

* feat: RBAC

* feat: RBAC 整理权限位

* feat: RBAC 整理权限位2

* feat: RBAC 整理权限位2

* feat: RBAC 整理权限位

* feat: RBAC 添加默认角色

* feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定

* feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定

* feat: RBAC 修改用户模块API

* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API

* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API

* feat: RBAC 修改用户角色属性的使用

* feat: RBAC No.1

* xxx

* perf: 暂存

* perf: ...

* perf(rbac): 添加 perms 到 profile serializer 中

* stash

* perf: 使用init

* perf: 修改migrations

* perf: rbac

* stash

* stash

* pref: 修改rbac

* stash it

* stash: 先去修复其他bug

* perf: 修改 role 添加 users

* pref: 修改 RBAC Model

* feat: 添加权限的 tree api

* stash: 暂存一下

* stash: 暂存一下

* perf: 修改 model verbose name

* feat: 添加model各种 verbose name

* perf: 生成 migrations

* perf: 优化权限位

* perf: 添加迁移脚本

* feat: 添加组织角色迁移

* perf: 添加迁移脚本

* stash

* perf: 添加migrateion

* perf: 暂存一下

* perf: 修改rbac

* perf: stash it

* fix: 迁移冲突

* fix: 迁移冲突

* perf: 暂存一下

* perf: 修改 rbac 逻辑

* stash: 暂存一下

* perf: 修改内置角色

* perf: 解决 root 组织的问题

* perf: stash it

* perf: 优化 rbac

* perf: 优化 rolebinding 处理

* perf: 完成用户离开组织的问题

* perf: 暂存一下

* perf: 修改翻译

* perf: 去掉了 IsSuperUser

* perf: IsAppUser 去掉完成

* perf: 修改 connection token 的权限

* perf: 去掉导入的问题

* perf: perms define 格式，修改 app 用户 的全新啊

* perf: 修改 permission

* perf: 去掉一些 org admin

* perf: 去掉部分 org admin

* perf: 再去掉点 org admin role

* perf: 再去掉部分 org admin

* perf: user 角色搜索

* perf: 去掉很多 js

* perf: 添加权限位

* perf: 修改权限

* perf: 去掉一个 todo

* merge: with dev

* fix: 修复冲突

Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: ibuler <ibuler@qq.com>

apps/terminal/models/__init__.py

@@ -5,3 +5,4 @@ from .storage import *
 from .task import *
 from .terminal import *
 from .sharing import *
+from .replay import *

apps/terminal/models/command.py

@@ -2,6 +2,8 @@ from __future__ import unicode_literals
 
 from django.db import models
 from django.db.models.signals import post_save
+from django.utils.translation import ugettext_lazy as _
+
 from ..backends.command.models import AbstractSessionCommand
 
 
@@ -19,3 +21,4 @@ class Command(AbstractSessionCommand):
     class Meta:
         db_table = "terminal_command"
         ordering = ('-timestamp',)
+        verbose_name = _('Command record')

apps/terminal/models/replay.py

@@ -0,0 +1,17 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+from common.mixins.models import CommonModelMixin
+from .session import Session
+
+
+class SessionReplay(CommonModelMixin):
+    session = models.ForeignKey(Session, on_delete=models.CASCADE, verbose_name=_("Session"))
+
+    class Meta:
+        permissions = [
+            ('upload_sessionreplay', _("Can upload session replay")),
+            ('download_sessionreplay', _("Can download session replay")),
+        ]
+
+

apps/terminal/models/session.py

@@ -236,6 +236,13 @@ class Session(OrgModelMixin):
     class Meta:
         db_table = "terminal_session"
         ordering = ["-date_start"]
+        verbose_name = _('Session record')
+        permissions = [
+            ('monitor_session', _('Can monitor session')),
+            ('share_session', _('Can share session')),
+            ('terminate_session', _('Can terminate session')),
+            ('validate_sessionactionperm', _('Can validate session action perm')),
+        ]
 
     def __str__(self):
         return "{0.id} of {0.user} to {0.asset}".format(self)

apps/terminal/models/sharing.py

@@ -1,9 +1,11 @@
-from django.db import models
 import datetime
-from common.mixins import CommonModelMixin
-from orgs.mixins.models import OrgModelMixin
+
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
+
+from common.mixins import CommonModelMixin
+from orgs.mixins.models import OrgModelMixin
 from .session import Session
 
 
@@ -29,6 +31,10 @@ class SessionSharing(CommonModelMixin, OrgModelMixin):
 
     class Meta:
         ordering = ('-date_created', )
+        verbose_name = _('Session sharing')
+        permissions = [
+            ('add_supersessionsharing', _("Can add super session sharing"))
+        ]
 
     def __str__(self):
         return 'Creator: {}'.format(self.creator)
@@ -93,6 +99,7 @@ class SessionJoinRecord(CommonModelMixin, OrgModelMixin):
 
     class Meta:
         ordering = ('-date_joined', )
+        verbose_name = _("Session join record")
 
     def __str__(self):
         return 'Joiner: {}'.format(self.joiner)

apps/terminal/models/status.py

@@ -30,6 +30,7 @@ class Status(models.Model):
     class Meta:
         db_table = 'terminal_status'
         get_latest_by = 'date_created'
+        verbose_name = _("Status")
 
     def save_to_cache(self):
         if not self.terminal:
@@ -73,3 +74,4 @@ class Status(models.Model):
         return self.save_to_cache()
         # return super().save()
 
+

apps/terminal/models/storage.py

@@ -109,6 +109,9 @@ class CommandStorage(CommonStorageModelMixin, CommonModelMixin):
             backend = engine_mod.CommandStore(self.config)
             backend.pre_use_check()
 
+    class Meta:
+        verbose_name = _("Command storage")
+
 
 class ReplayStorage(CommonStorageModelMixin, CommonModelMixin):
     type = models.CharField(
@@ -165,3 +168,6 @@ class ReplayStorage(CommonStorageModelMixin, CommonModelMixin):
 
     def is_use(self):
         return Terminal.objects.filter(replay_storage=self.name, is_deleted=False).exists()
+
+    class Meta:
+        verbose_name = _("Replay storage")

apps/terminal/models/task.py

@@ -23,4 +23,5 @@ class Task(models.Model):
 
     class Meta:
         db_table = "terminal_task"
+        verbose_name = _("Task")
 

apps/terminal/models/terminal.py

@@ -189,4 +189,8 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
     class Meta:
         ordering = ('is_accepted',)
         db_table = "terminal"
+        verbose_name = _("Terminal")
+        permissions = (
+            ('view_terminalconfig', 'Can view terminal config'),
+        )