feat: 清洗字段校验逻辑调整和增加别名功能

bklog/apps/log_esquery/esquery/dsl_builder/query_builder/query_builder_logic.py

@@ -34,7 +34,7 @@
 
 from apps.log_esquery.constants import WILDCARD_PATTERN, WILDCARD_QUERY
 from apps.log_esquery.exceptions import BaseSearchDslException
-from apps.log_search.constants import FieldDataTypeEnum
+from apps.log_search.constants import ES_RESERVED_CHARACTERS, FieldDataTypeEnum
 from apps.log_search.handlers.search.mapping_handlers import MappingHandlers
 
 type_wildcard = Dict[str, Dict[str, Any]]  # pylint: disable=invalid-name
@@ -288,6 +288,18 @@ def generate_querystring(field_name, value_list, condition_type="OR"):
         transform_result = transform_result if len(value_list) == 1 else f"({transform_result})"
         return f"{field_name}: {transform_result}"
 
+    @staticmethod
+    def escape_special_characters(string: str, is_wildcard=False):
+        wildcard_list = ["*", "?"]
+        # 转义es的的保留字
+        for char in ES_RESERVED_CHARACTERS:
+            if is_wildcard and char in wildcard_list:
+                # 对于使用通配符的es查询, 不转义通配符
+                continue
+            # 使用字符串的 replace 方法进行替换
+            string = string.replace(char, f"\\{char}")
+        return string
+
 
 class Is(BoolQueryOperation):
     TARGET = "must"
@@ -297,9 +309,13 @@ def op(self, field):
         self._set_target_value(EsQueryBuilder.build_match_phrase_query(field["field"], field["value"]))
 
     def to_querystring(self):
+        value_list = []
+        for value in self._bool_dict["value"]:
+            value = value.replace('"', '\\"')
+            value_list.append(f"\"{value}\"")
         return self.generate_querystring(
             self._bool_dict["field"],
-            self._bool_dict["value"],
+            value_list,
         )
 
 
@@ -334,9 +350,13 @@ def op(self, field):
         self._set_target_value(EsQueryBuilder.build_match_phrase_query(field["field"], field["value"]))
 
     def to_querystring(self):
+        value_list = []
+        for value in self._bool_dict["value"]:
+            value = value.replace('"', '\\"')
+            value_list.append(f"\"{value}\"")
         return "NOT " + self.generate_querystring(
             self._bool_dict["field"],
-            self._bool_dict["value"],
+            value_list,
         )
 
 
@@ -351,9 +371,13 @@ def op(self, field):
         self._set_target_value(a_bool)
 
     def to_querystring(self):
+        value_list = []
+        for value in self._bool_dict["value"]:
+            value = value.replace('"', '\\"')
+            value_list.append(f"\"{value}\"")
         return self.generate_querystring(
             self._bool_dict["field"],
-            self._bool_dict["value"],
+            value_list,
         )
 
 
@@ -485,9 +509,13 @@ def op(self, field):
         self._set_target_value(a_bool)
 
     def to_querystring(self):
+        value_list = []
+        for value in self._bool_dict["value"]:
+            value = self.escape_special_characters(value, is_wildcard=True)
+            value_list.append(value)
         return self.generate_querystring(
             self._bool_dict["field"],
-            self._bool_dict["value"],
+            value_list,
         )
 
 
@@ -514,6 +542,7 @@ def op(self, field):
     def to_querystring(self):
         value_list = []
         for value in self._bool_dict["value"]:
+            value = self.escape_special_characters(value)
             value_list.append(f"*{value}*")
         return self.generate_querystring(
             self._bool_dict["field"],
@@ -526,9 +555,6 @@ class NotContains(Contains):
     OPERATOR = "not contains"
 
     def to_querystring(self):
-        value_list = []
-        for value in self._bool_dict["value"]:
-            value_list.append(f"*{value}*")
         return "NOT " + super().to_querystring()
 
 
@@ -605,9 +631,13 @@ def op(self, field):
         self._set_target_value(a_bool)
 
     def to_querystring(self):
+        value_list = []
+        for value in self._bool_dict["value"]:
+            value = self.escape_special_characters(value, is_wildcard=True)
+            value_list.append(value)
         return self.generate_querystring(
             self._bool_dict["field"],
-            self._bool_dict["value"],
+            value_list,
             condition_type="AND",
         )
 

bklog/apps/log_search/constants.py

@@ -1677,3 +1677,30 @@ class OperatorEnum:
     "is true": "IS TRUE",
     "is false": "IS FALSE",
 }
+
+# es保留字符
+ES_RESERVED_CHARACTERS = [
+    "\\",
+    "+",
+    "-",
+    "=",
+    "&&",
+    "||",
+    ">",
+    "<",
+    "!",
+    "(",
+    ")",
+    "{",
+    "}",
+    "[",
+    "]",
+    "^",
+    "\"",
+    "~",
+    "*",
+    "?",
+    ":",
+    "/",
+    " ",
+]

bklog/apps/tests/log_search/test_querystring.py

@@ -20,18 +20,18 @@
         {"field": "number", "operator": "gte", "value": [100, 50]},
         {"field": "id", "operator": "lte", "value": [500]},
         {"field": "gseIndex", "operator": "=~", "value": ["?proz/Saved/Logs/ProjectA_2024.10.20-23.17.50*"]},
-        {"field": "path", "operator": "!=~", "value": ["?app/*/python.*", "*/python.*"]},
-        {"field": "cloudId", "operator": "contains", "value": ["6", "9"]},
-        {"field": "cloudId", "operator": "not contains", "value": ["1", "3"]},
+        {"field": "path", "operator": "!=~", "value": ["?app python.*", "*/python.*"]},
+        {"field": "cloudId", "operator": "contains", "value": ["6+6", "9+1=10"]},
+        {"field": "cloudId", "operator": "not contains", "value": ["1&&2", "3*3"]},
         {"field": "is_deleted", "operator": "is false", "value": []},
         {"field": "flag", "operator": "is true", "value": [1]},
         {"field": "log", "operator": "contains match phrase", "value": ["html", "hello world"]},
         {"field": "log", "operator": "not contains match phrase", "value": ["are you ok"]},
         {"field": "log", "operator": "all contains match phrase", "value": ["su 7"]},
         {"field": "log", "operator": "all not contains match phrase", "value": ["error", "500"]},
         {"field": "log", "operator": "all not contains match phrase", "value": ["This is a \"test\" string"]},
-        {"field": "describe", "operator": "&=~", "value": ["?el*", "wor?d"]},
-        {"field": "theme", "operator": "&!=~", "value": ["pg*", "?h?"]},
+        {"field": "describe", "operator": "&=~", "value": ["?e:l*", "w(or)?d"]},
+        {"field": "theme", "operator": "&!=~", "value": ["pg||db*", r"?h\h?"]},
         {"field": "*", "operator": "contains match phrase", "value": ["error"]},
         {"field": "querystring", "operator": "contains match phrase", "value": ["success", "200"]},
         {"field": "querystring", "operator": "=", "value": []},
@@ -40,21 +40,20 @@
     ],
 }
 
-
 TRANSFORM_RESULT = (
-    "bk_host_id: (1 OR 2)"
+    "bk_host_id: (\"1\" OR \"2\")"
     " AND "
-    "bk_host_id: (3 OR 4)"
+    "bk_host_id: (\"3\" OR \"4\")"
     " AND "
-    "bk_host_id: (5 OR 6)"
+    "bk_host_id: (\"5\" OR \"6\")"
     " AND "
-    "NOT service: php"
+    "NOT service: \"php\""
     " AND "
-    "NOT service: (a OR b)"
+    "NOT service: (\"a\" OR \"b\")"
     " AND "
-    "service: (c OR d)"
+    "service: (\"c\" OR \"d\")"
     " AND "
-    "NOT service: (e OR f)"
+    "NOT service: (\"e\" OR \"f\")"
     " AND "
     "count: <200"
     " AND "
@@ -72,13 +71,13 @@
     " AND "
     "id: <=500"
     " AND "
-    "gseIndex: ?proz/Saved/Logs/ProjectA_2024.10.20-23.17.50*"
+    r"gseIndex: ?proz\/Saved\/Logs\/ProjectA_2024.10.20\-23.17.50*"
     " AND "
-    "NOT path: (?app/*/python.* OR */python.*)"
+    r"NOT path: (?app\ python.* OR *\/python.*)"
     " AND "
-    "cloudId: (*6* OR *9*)"
+    r"cloudId: (*6\+6* OR *9\+1\=10*)"
     " AND "
-    "NOT cloudId: (*1* OR *3*)"
+    r"NOT cloudId: (*1\&&2* OR *3\*3*)"
     " AND "
     "is_deleted: false"
     " AND "
@@ -94,9 +93,9 @@
     " AND "
     "NOT log: \"This is a \\\"test\\\" string\""
     " AND "
-    "describe: (?el* AND wor?d)"
+    r"describe: (?e\:l* AND w\(or\)?d)"
     " AND "
-    "NOT theme: (pg* AND ?h?)"
+    r"NOT theme: (pg\||db* AND ?h\\h?)"
     " AND "
     "(\"error\")"
     " AND "

bklog/web/src/components/collection-access/components/log-filter/index.tsx

@@ -228,18 +228,17 @@ export default class LogFilter extends tsc<object> {
         return;
       }
       let isCanSubmit = true;
-      const container = this.$refs.filterTableRef as any;
 
       for (const fIndex in this.filterData) {
+        const container = this.$refs[`filterTableRef-${fIndex}`] as any;
         for (const iIndex in this.filterData[fIndex]) {
           let matchNotError = true;
 
           // 字符串类型过滤暂时无过滤参数（全文）
           if (this.activeType === 'separator') {
-            matchNotError = await (container?.$refs[`match-${fIndex}-${iIndex}`] as Form)?.validate();
+            matchNotError = await (container?.$refs[`match-${fIndex}-${fIndex}-${iIndex}`] as Form)?.validate();
           }
-          const valueNotError = await (container?.$refs[`value-${fIndex}-${iIndex}`] as Form)?.validate();
-
+          const valueNotError = await (container?.$refs[`value-${fIndex}-${fIndex}-${iIndex}`] as Form)?.validate();
           if (isCanSubmit) isCanSubmit = matchNotError && valueNotError;
         }
       }
@@ -328,30 +327,36 @@ export default class LogFilter extends tsc<object> {
   }
 
   render() {
-    const fieldIndexInputSlot = {
-      default: ({ $index, row }) => (
-        <ValidatorInput
-          ref={`match-${row.tableIndex}-${$index}`}
-          v-model={row.fieldindex}
-          active-type={this.activeType}
-          input-type={'number'}
-          original-filter-item-select={this.originalFilterItemSelect}
-          placeholder={this.$t('请输入列数')}
-          row-data={row}
-          table-index={row.tableIndex}
-        />
-      ),
+    const fieldIndexInputSlot = groupid => {
+      return {
+        default: ({ $index, row }) => (
+          <ValidatorInput
+            ref={`match-${groupid}-${row.tableIndex}-${$index}`}
+            v-model={row.fieldindex}
+            active-type={this.activeType}
+            input-type={'number'}
+            original-filter-item-select={this.originalFilterItemSelect}
+            placeholder={this.$t('请输入列数')}
+            row-data={row}
+            table-index={row.tableIndex}
+          />
+        ),
+      };
     };
-    const valueInputSlot = {
-      default: ({ $index, row }) => (
-        <ValidatorInput
-          ref={`value-${row.tableIndex}-${$index}`}
-          v-model={row.word}
-          active-type={this.activeType}
-          placeholder={['regex', 'nregex'].includes(row.op) ? this.$t('支持正则匹配，如18*123') : this.$t('请输入')}
-          row-data={row}
-        />
-      ),
+    const valueInputSlot = groupId => {
+      return {
+        default: ({ $index, row }) => (
+          <div>
+            <ValidatorInput
+              ref={`value-${groupId}-${row.tableIndex}-${$index}`}
+              v-model={row.word}
+              active-type={this.activeType}
+              placeholder={['regex', 'nregex'].includes(row.op) ? this.$t('支持正则匹配，如18*123') : this.$t('请输入')}
+              row-data={row}
+            />
+          </div>
+        ),
+      };
     };
     const selectSlot = {
       default: ({ row }) => (
@@ -455,7 +460,7 @@ export default class LogFilter extends tsc<object> {
                   ></i>
                 </div>
                 <bk-table
-                  ref='filterTableRef'
+                  ref={`filterTableRef-${index}`}
                   data={item}
                   col-border
                   dark-header
@@ -475,7 +480,7 @@ export default class LogFilter extends tsc<object> {
                   <bk-table-column
                     label='Value'
                     prop='word'
-                    scopedSlots={valueInputSlot}
+                    scopedSlots={valueInputSlot(index)}
                   />
                   <bk-table-column
                     width='95'