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>
2025-09-16 07:18:22 +00:00 · 2022-02-17 20:13:31 +08:00
parent b088362ae3
commit e259d2a9e9
263 changed files with 3049 additions and 62465 deletions
--- a/apps/settings/api/alibaba_sms.py
+++ b/apps/settings/api/alibaba_sms.py
@@ -6,15 +6,16 @@ from django.utils.translation import gettext_lazy as _

 from common.sdk.sms.alibaba import AlibabaSMS
 from settings.models import Setting
-from common.permissions import IsSuperUser
 from common.exceptions import JMSException

 from .. import serializers


 class AlibabaSMSTestingAPI(GenericAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = serializers.AlibabaSMSSettingSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)
--- a/apps/settings/api/dingtalk.py
+++ b/apps/settings/api/dingtalk.py
@@ -5,14 +5,11 @@ from rest_framework import status
 from django.utils.translation import gettext_lazy as _

 from django.conf import settings
-from common.permissions import IsSuperUser
 from common.sdk.im.dingtalk import DingTalk
-
 from .. import serializers


 class DingTalkTestingAPI(GenericAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = serializers.DingTalkSettingSerializer

    def post(self, request):
--- a/apps/settings/api/email.py
+++ b/apps/settings/api/email.py
@@ -6,7 +6,6 @@ from rest_framework.views import Response, APIView
 from django.core.mail import send_mail, get_connection
 from django.utils.translation import ugettext_lazy as _

-from common.permissions import IsSuperUser
 from common.utils import get_logger
 from .. import serializers
 from django.conf import settings
@@ -17,9 +16,11 @@ __all__ = ['MailTestingAPI']


 class MailTestingAPI(APIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = serializers.MailTestSerializer
    success_message = _("Test mail sent to {}, please check")
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)
--- a/apps/settings/api/feishu.py
+++ b/apps/settings/api/feishu.py
@@ -5,15 +5,16 @@ from rest_framework import status
 from django.utils.translation import gettext_lazy as _

 from settings.models import Setting
-from common.permissions import IsSuperUser
 from common.sdk.im.feishu import FeiShu

 from .. import serializers


 class FeiShuTestingAPI(GenericAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = serializers.FeiShuSettingSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)
--- a/apps/settings/api/ldap.py
+++ b/apps/settings/api/ldap.py
@@ -13,7 +13,6 @@ from ..utils import (
    LDAP_USE_CACHE_FLAGS, LDAPTestUtil
 )
 from ..tasks import sync_ldap_user
-from common.permissions import IsSuperUser
 from common.utils import get_logger, is_uuid
 from ..serializers import (
    LDAPTestConfigSerializer, LDAPUserSerializer,
@@ -26,8 +25,10 @@ logger = get_logger(__file__)


 class LDAPTestingConfigAPI(APIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = LDAPTestConfigSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)
@@ -66,8 +67,10 @@ class LDAPTestingConfigAPI(APIView):


 class LDAPTestingLoginAPI(APIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = LDAPTestLoginSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)
@@ -81,8 +84,10 @@ class LDAPTestingLoginAPI(APIView):


 class LDAPUserListApi(generics.ListAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = LDAPUserSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def get_queryset_from_cache(self):
        search_value = self.request.query_params.get('search')
@@ -170,8 +175,6 @@ class LDAPUserListApi(generics.ListAPIView):


 class LDAPUserImportAPI(APIView):
-    permission_classes = (IsSuperUser,)
-
    def get_org(self):
        org_id = self.request.data.get('org_id')
        if is_uuid(org_id):
@@ -210,8 +213,6 @@ class LDAPUserImportAPI(APIView):


 class LDAPCacheRefreshAPI(generics.RetrieveAPIView):
-    permission_classes = (IsSuperUser,)
-
    def retrieve(self, request, *args, **kwargs):
        try:
            LDAPSyncUtil().clear_cache()
--- a/apps/settings/api/settings.py
+++ b/apps/settings/api/settings.py
@@ -5,7 +5,7 @@ from rest_framework import generics
 from django.conf import settings

 from jumpserver.conf import Config
-from common.permissions import IsSuperUser
+from rbac.permissions import RBACPermission
 from common.utils import get_logger
 from .. import serializers
 from ..models import Setting
@@ -14,7 +14,8 @@ logger = get_logger(__file__)


 class SettingsApi(generics.RetrieveUpdateAPIView):
-    permission_classes = (IsSuperUser,)
+    permission_classes = (RBACPermission,)
+
    serializer_class_mapper = {
        'all': serializers.SettingsSerializer,
        'basic': serializers.BasicSettingSerializer,
@@ -40,6 +41,9 @@ class SettingsApi(generics.RetrieveUpdateAPIView):
        'tencent': serializers.TencentSMSSettingSerializer,
    }

+    def get_queryset(self):
+        return Setting.objects.all()
+
    def get_serializer_class(self):
        category = self.request.query_params.get('category', 'basic')
        default = serializers.BasicSettingSerializer
--- a/apps/settings/api/sms.py
+++ b/apps/settings/api/sms.py
@@ -1,14 +1,15 @@
 from rest_framework.generics import ListAPIView
 from rest_framework.response import Response

-from common.permissions import IsSuperUser
 from common.sdk.sms import BACKENDS
 from settings.serializers.sms import SMSBackendSerializer


 class SMSBackendAPI(ListAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = SMSBackendSerializer
+    rbac_perms = {
+        'list': 'settings.view_setting'
+    }

    def list(self, request, *args, **kwargs):
        data = [
@@ -16,7 +17,7 @@ class SMSBackendAPI(ListAPIView):
                'name': b,
                'label': b.label
            }
-            for b in BACKENDS
+            for b in BACKENDS.choices
        ]

        return Response(data)
--- a/apps/settings/api/tencent_sms.py
+++ b/apps/settings/api/tencent_sms.py
@@ -8,15 +8,16 @@ from django.utils.translation import gettext_lazy as _

 from common.sdk.sms.tencent import TencentSMS
 from settings.models import Setting
-from common.permissions import IsSuperUser
 from common.exceptions import JMSException

 from .. import serializers


 class TencentSMSTestingAPI(GenericAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = serializers.TencentSMSSettingSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)
--- a/apps/settings/api/wecom.py
+++ b/apps/settings/api/wecom.py
@@ -5,15 +5,16 @@ from rest_framework import status
 from django.utils.translation import gettext_lazy as _

 from settings.models import Setting
-from common.permissions import IsSuperUser
 from common.sdk.im.wecom import WeCom

 from .. import serializers


 class WeComTestingAPI(GenericAPIView):
-    permission_classes = (IsSuperUser,)
    serializer_class = serializers.WeComSettingSerializer
+    rbac_perms = {
+        'POST': 'settings.change_setting'
+    }

    def post(self, request):
        serializer = self.serializer_class(data=request.data)