Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfd38f39

Browse files
committed
gis-8971 fixes
1 parentf1fb03b commitfd38f39

File tree

8 files changed

+35
-42
lines changed

8 files changed

+35
-42
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
fromapp.translator.core.custom_types.tokensimportLogicalOperatorType,OperatorType
2+
fromapp.translator.core.mappingimportSourceMapping
3+
fromapp.translator.core.models.query_tokens.field_valueimportFieldValue
4+
fromapp.translator.core.models.query_tokens.identifierimportIdentifier
5+
6+
7+
classExtraConditionMixin:
8+
defgenerate_extra_conditions(self,source_mapping:SourceMapping)->list:
9+
extra_tokens= []
10+
forfield,valueinsource_mapping.conditions.items():
11+
extra_tokens.extend(
12+
[
13+
FieldValue(source_name=field,operator=Identifier(token_type=OperatorType.EQ),value=value),
14+
Identifier(token_type=LogicalOperatorType.AND),
15+
]
16+
)
17+
returnextra_tokens

‎uncoder-core/app/translator/core/render.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,8 @@ def process_raw_log_field_prefix(self, field: str, source_mapping: SourceMapping
403403
ifraw_log_field_type:=source_mapping.raw_log_fields.get(field):
404404
return [self.process_raw_log_field(field=field,field_type=raw_log_field_type)]
405405

406-
defgenerate_extra_conditions(self,source_mapping:SourceMapping,tokens:list)->list:# noqa: ARG002
407-
returntokens
406+
defgenerate_extra_conditions(self,source_mapping:SourceMapping)->list:# noqa: ARG002
407+
return[]
408408

409409
defgenerate_raw_log_fields(self,fields:list[Field],source_mapping:SourceMapping)->str:
410410
ifnotself.raw_log_field_patterns_map:
@@ -446,9 +446,8 @@ def _generate_from_tokenized_query_container_by_source_mapping(
446446
)
447447
prefix+=f"\n{defined_raw_log_fields}"
448448
ifsource_mapping.conditions:
449-
query_container.tokens=self.generate_extra_conditions(
450-
source_mapping=source_mapping,tokens=query_container.tokens
451-
)
449+
extra_tokens=self.generate_extra_conditions(source_mapping=source_mapping)
450+
query_container.tokens= [*extra_tokens,*query_container.tokens]
452451
query=self.generate_query(tokens=query_container.tokens,source_mapping=source_mapping)
453452
not_supported_functions=query_container.functions.not_supported+rendered_functions.not_supported
454453
returnself.finalize_query(

‎uncoder-core/app/translator/platforms/arcsight/const.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
"alt_platform_name":"CEF",
1010
}
1111

12-
arcsight_query_details=PlatformDetails(**ARCSIGHT_QUERY_DETAILS)
12+
arcsight_query_details=PlatformDetails(**ARCSIGHT_QUERY_DETAILS)

‎uncoder-core/app/translator/platforms/arcsight/escape_manager.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
classArcSightEscapeManager(EscapeManager):
99
escape_map:ClassVar[dict[str,list[EscapeDetails]]]= {
10-
ValueType.value: [
11-
EscapeDetails(pattern='(["\\()])',escape_symbols="\\\\\g<1>")
12-
],
10+
ValueType.value: [EscapeDetails(pattern='(["\\()])',escape_symbols="\\\\\g<1>")]
1311
}
1412

1513

‎uncoder-core/app/translator/platforms/arcsight/mapping.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
fromapp.translator.core.mappingimportLogSourceSignature, \
2-
BaseStrictLogSourcesPlatformMappings
1+
fromapp.translator.core.mappingimportBaseStrictLogSourcesPlatformMappings,LogSourceSignature
32
fromapp.translator.platforms.arcsight.constimportarcsight_query_details
43

54

‎uncoder-core/app/translator/platforms/arcsight/renders/arcsight.py‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
fromtypingimportOptional,Union
22

33
fromapp.translator.constimportDEFAULT_VALUE_TYPE
4-
fromapp.translator.core.custom_types.tokensimportOperatorType,LogicalOperatorType
54
fromapp.translator.core.custom_types.valuesimportValueType
6-
fromapp.translator.core.mappingimportLogSourceSignature,SourceMapping
5+
fromapp.translator.core.mappingimportLogSourceSignature
6+
fromapp.translator.core.mixins.tokensimportExtraConditionMixin
77
fromapp.translator.core.models.platform_detailsimportPlatformDetails
8-
fromapp.translator.core.models.query_tokens.field_valueimportFieldValue
9-
fromapp.translator.core.models.query_tokens.identifierimportIdentifier
108
fromapp.translator.core.renderimportBaseFieldValueRender,PlatformQueryRender
11-
fromapp.translator.core.str_value_managerimportStrValueManager,StrValue
9+
fromapp.translator.core.str_value_managerimportStrValue,StrValueManager
1210
fromapp.translator.managersimportrender_manager
1311
fromapp.translator.platforms.arcsight.constimportarcsight_query_details
14-
fromapp.translator.platforms.arcsight.mappingimportarcsight_query_mappings,ArcSightMappings
12+
fromapp.translator.platforms.arcsight.mappingimportArcSightMappings,arcsight_query_mappings
1513
fromapp.translator.platforms.arcsight.str_value_managerimportarcsight_str_value_manager
1614

1715

@@ -85,8 +83,9 @@ def regex_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
8583
value=self._wrap_str_value(value)
8684
returnf"{field} CONTAINS{value}"
8785

86+
8887
@render_manager.register
89-
classArcSightQueryRender(PlatformQueryRender):
88+
classArcSightQueryRender(ExtraConditionMixin,PlatformQueryRender):
9089
details:PlatformDetails=arcsight_query_details
9190
mappings:ArcSightMappings=arcsight_query_mappings
9291

@@ -100,12 +99,3 @@ class ArcSightQueryRender(PlatformQueryRender):
10099

101100
defgenerate_prefix(self,log_source_signature:Optional[LogSourceSignature],functions_prefix:str="")->str:# noqa: ARG002
102101
return""
103-
104-
defgenerate_extra_conditions(self,source_mapping:SourceMapping,tokens:list)->list:
105-
extra_tokens= []
106-
forfield,valueinsource_mapping.conditions.items():
107-
extra_tokens.extend([
108-
FieldValue(source_name=field,operator=Identifier(token_type=OperatorType.EQ),value=value),
109-
Identifier(token_type=LogicalOperatorType.AND)
110-
])
111-
return [*extra_tokens,*tokens]

‎uncoder-core/app/translator/platforms/arcsight/renders/arcsight_cti.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fromapp.translator.core.models.platform_detailsimportPlatformDetails
22
fromapp.translator.core.render_ctiimportRenderCTI
33
fromapp.translator.managersimportrender_cti_manager
4-
fromapp.translator.platforms.arcsight.constimportARCSIGHT_QUERY_DETAILS,arcsight_query_details
4+
fromapp.translator.platforms.arcsight.constimportarcsight_query_details
55
fromapp.translator.platforms.arcsight.mappings.arcsight_ctiimportDEFAULT_ARCSIGHT_MAPPING
66

77

‎uncoder-core/app/translator/platforms/elasticsearch/renders/elasticsearch_eql.py‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
fromapp.translator.constimportDEFAULT_VALUE_TYPE
44
fromapp.translator.core.constimportQUERY_TOKEN_TYPE
5-
fromapp.translator.core.custom_types.tokensimportGroupType,LogicalOperatorType,OperatorType
5+
fromapp.translator.core.custom_types.tokensimportGroupType
66
fromapp.translator.core.custom_types.valuesimportValueType
7-
fromapp.translator.core.mappingimportLogSourceSignature,SourceMapping
7+
fromapp.translator.core.mappingimportLogSourceSignature
8+
fromapp.translator.core.mixins.tokensimportExtraConditionMixin
89
fromapp.translator.core.models.platform_detailsimportPlatformDetails
9-
fromapp.translator.core.models.query_tokens.field_valueimportFieldValue
1010
fromapp.translator.core.models.query_tokens.identifierimportIdentifier
1111
fromapp.translator.core.renderimportBaseFieldValueRender,PlatformQueryRender
1212
fromapp.translator.core.str_value_managerimportStrValueManager
@@ -119,7 +119,7 @@ def is_not_none(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: # noqa: AR
119119

120120

121121
@render_manager.register
122-
classElasticSearchEQLQueryRender(PlatformQueryRender):
122+
classElasticSearchEQLQueryRender(ExtraConditionMixin,PlatformQueryRender):
123123
details:PlatformDetails=elastic_eql_query_details
124124
mappings:LuceneMappings=elastic_eql_query_mappings
125125
or_token="or"
@@ -133,13 +133,3 @@ def generate_prefix(self, log_source_signature: Optional[LogSourceSignature], fu
133133

134134
defin_brackets(self,raw_list:list[QUERY_TOKEN_TYPE])->list[QUERY_TOKEN_TYPE]:
135135
return [Identifier(token_type=GroupType.L_PAREN),*raw_list,Identifier(token_type=GroupType.R_PAREN)]
136-
137-
defgenerate_extra_conditions(self,source_mapping:SourceMapping,tokens:list)->list:
138-
forfield,valueinsource_mapping.conditions.items():
139-
tokens=self.in_brackets(tokens)
140-
extra_tokens= [
141-
FieldValue(source_name=field,operator=Identifier(token_type=OperatorType.EQ),value=value),
142-
Identifier(token_type=LogicalOperatorType.AND),
143-
]
144-
tokens=self.in_brackets([*extra_tokens,*tokens])
145-
returntokens

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp