fix(backend): 修复tendbcluster重命名校验问题 #6535

TencentBlueKing · Aug 29, 2024 · 3e22fd8 · 3e22fd8
1 parent cbcaaeb
commit 3e22fd8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/dbm-ui/backend/db_services/mysql/sqlparse/handlers.py b/dbm-ui/backend/db_services/mysql/sqlparse/handlers.py
@@ -111,7 +111,7 @@ def parse_show_desc_tokens(tokens):
             if keyword[0].upper() in ["DESC", "DESCRIBE", "USE"]:
                 return True
             # 允许show databases，show processlist、show slave status
-            if keyword[0].upper() == "SHOW" and ids[0] in ["DATABASES", "PROCESSLIST", "SLAVE STATUS"]:
+            if keyword[0].upper() == "SHOW" and ids and ids[0] in ["DATABASES", "PROCESSLIST", "SLAVE STATUS"]:
                 return True
             # 允许show tables，show create
             if len(keyword) > 1 and keyword[0].upper() == "SHOW" and keyword[1].upper() in ["TABLES", "CREATE"]:

diff --git a/dbm-ui/backend/ticket/builders/tendbcluster/tendb_rename.py b/dbm-ui/backend/ticket/builders/tendbcluster/tendb_rename.py
@@ -10,6 +10,7 @@
 """
 from django.utils.translation import ugettext as _
 
+from backend.db_meta.enums import ClusterType
 from backend.flow.engine.controller.spider import SpiderController
 from backend.ticket import builders
 from backend.ticket.builders.mysql.mysql_ha_rename import MySQLHaRenameFlowParamBuilder, MySQLHaRenameSerializer
@@ -18,7 +19,13 @@
 
 
 class TendbRenameSerializer(MySQLHaRenameSerializer):
-    pass
+    def validate(self, attrs):
+        super().validate_cluster_can_access(attrs)
+        # 集群类型校验
+        super().validated_cluster_type(attrs, cluster_type=ClusterType.TenDBCluster)
+        # DB重命名校验
+        super().validate_rename_db(attrs)
+        return attrs
 
 
 class TendbRenameFlowParamBuilder(MySQLHaRenameFlowParamBuilder):