fix(backend): 修复cl5域名精确查找问题 #11322

# Reviewed, transaction id: 47997

Author: ygcyao

dbm-ui/backend/constants.py

@@ -29,6 +29,9 @@
 IP_RE_PATTERN = r"(?:(?:2(?:5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(?:\.(?:(?:2(?:5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}"
 IP_PORT_RE_PATTERN = r"(?:[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]{1,5}"
 
+# 域名正则表达式
+DOMAIN_PATTERN = r"^[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}){2,8}\.*(#(\d+))?$"
+
 # 是否有备份系统
 BACKUP_SYS_STATUS = True
 

dbm-ui/backend/db_services/quick_search/handlers.py

@@ -8,10 +8,13 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+import re
+
 from django.db.models import CharField, F, Q, Value
 from django.db.models.functions import Concat
 
 from backend.configuration.models import DBAdministrator
+from backend.constants import DOMAIN_PATTERN
 from backend.db_dirty.models import DirtyMachine
 from backend.db_dirty.serializers import ListMachinePoolSerializer
 from backend.db_meta.enums import ClusterType
@@ -97,6 +100,10 @@ def generate_filter_for_domain(self, filter_key, keyword_list):
             except ValueError:
                 domain, _ = keyword, None
 
+            # 如果不是有效的域名，则直接将整个字符串作为域名
+            if not re.compile(DOMAIN_PATTERN).match(domain):
+                domain = keyword
+
             if self.filter_type == FilterType.EXACT.value:
                 domains.append(domain)
             else:

dbm-ui/backend/ticket/builders/common/base.py

@@ -21,6 +21,7 @@
 from rest_framework import serializers
 
 from backend.configuration.constants import MASTER_DOMAIN_INITIAL_VALUE, PLAT_BIZ_ID, AffinityEnum
+from backend.constants import DOMAIN_PATTERN
 from backend.db_meta.enums import AccessLayer, ClusterPhase, ClusterType, InstanceInnerRole, InstanceStatus
 from backend.db_meta.enums.comm import SystemTagEnum
 from backend.db_meta.models import Cluster, ExtraProcessInstance, Machine, ProxyInstance, Spec, StorageInstance
@@ -186,7 +187,7 @@ def validated_params(self, attrs):
 class CommonValidate(object):
     """存放单据的公共校验逻辑"""
 
-    domain_pattern = re.compile(r"^[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}){2,8}\.*(#(\d+))?$")
+    domain_pattern = re.compile(DOMAIN_PATTERN)
 
     @classmethod
     def validate_destroy_temporary_cluster_ids(cls, cluster_ids):