NotificationsYou must be signed in to change notification settings
Fork33
Star165

Commited36ada

committed

fixes

1 parent3a30dcf commited36adaCopy full SHA for ed36ada

File tree

3 files changed

+16

-23

lines changed

uncoder-core/app/translator
- core
  - mapping.py
- mappings/utils
  - load_from_files.py
- platforms/microsoft/parsers
  - microsoft_sentinel.py

3 files changed

+16

-23

lines changed

`‎uncoder-core/app/translator/core/mapping.py‎`

Lines changed: 13 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ def update_default_source_mapping(self, default_mapping: SourceMapping, fields_m`
`121`	`121`
`122`	`122`	`defprepare_alternative_mapping(self,platform_dir:str)->dict[str,dict[str,SourceMapping]]:`
`123`	`123`	`alternative_mappings= {}`
`124`		`-forname,platform_dirinself._loader.get_platform_alternative_mappings(platform_dir).items():`
	`124`	`+forname,platform_dirinself._loader.get_platform_alternative_mappings_dirs(platform_dir).items():`
`125`	`125`	`alternative_mappings[name]=self.prepare_mapping(platform_dir)`
`126`	`126`	`returnalternative_mappings`
`127`	`127`
`@@ -170,10 +170,18 @@ def prepare_log_source_signature(self, mapping: dict) -> LogSourceSignature:`
`170`	`170`
`171`	`171`	`defget_source_mappings_by_fields_and_log_sources(`
`172`	`172`	`self,field_names:list[str],log_sources:dict[str,list[Union[int,str]]]`
	`173`	`+ )->list[SourceMapping]:`
	`174`	`+returnself._get_source_mappings_by_fields_and_log_sources(field_names,log_sources,self._source_mappings)`
	`175`	`+`
	`176`	`+def_get_source_mappings_by_fields_and_log_sources(`
	`177`	`+self,`
	`178`	`+field_names:list[str],`
	`179`	`+log_sources:dict[str,list[Union[int,str]]],`
	`180`	`+source_mapping:dict[str,SourceMapping],`
`173`	`181`	`)->list[SourceMapping]:`
`174`	`182`	`by_log_sources_and_fields= []`
`175`	`183`	`by_fields= []`
`176`		`-forsource_mappinginself._source_mappings.values():`
	`184`	`+forsource_mappinginsource_mapping.values():`
`177`	`185`	`ifsource_mapping.source_id==DEFAULT_MAPPING_NAME:`
`178`	`186`	`continue`
`179`	`187`
`@@ -184,28 +192,13 @@ def get_source_mappings_by_fields_and_log_sources(`
`184`	`192`	`iflog_source_signatureandlog_source_signature.is_suitable(**log_sources):`
`185`	`193`	`by_log_sources_and_fields.append(source_mapping)`
`186`	`194`
`187`		`-returnby_log_sources_and_fieldsorby_fieldsor [self._source_mappings[DEFAULT_MAPPING_NAME]]`
	`195`	`+returnby_log_sources_and_fieldsorby_fieldsor [source_mapping[DEFAULT_MAPPING_NAME]]`
`188`	`196`
`189`	`197`	`defget_alt_source_mappings_by_fields_and_log_sources(`
`190`	`198`	`self,field_names:list[str],log_sources:dict[str,list[Union[int,str]]],alt_mapping:str`
`191`	`199`	`)->list[SourceMapping]:`
`192`		`-by_log_sources_and_fields= []`
`193`		`-by_fields= []`
`194`		`-forsource_mappinginself._alternative_mappings.get(alt_mapping, {}).values():`
`195`		`-ifsource_mapping.source_id==DEFAULT_MAPPING_NAME:`
`196`		`-continue`
`197`		`-`
`198`		`-ifsource_mapping.fields_mapping.is_suitable(field_names):`
`199`		`-by_fields.append(source_mapping)`
`200`		`-`
`201`		`-log_source_signature:LogSourceSignature=source_mapping.log_source_signature`
`202`		`-iflog_source_signatureandlog_source_signature.is_suitable(**log_sources):`
`203`		`-by_log_sources_and_fields.append(source_mapping)`
`204`		`-`
`205`		`-return (`
`206`		`-by_log_sources_and_fields`
`207`		`-orby_fields`
`208`		`-or [self._alternative_mappings.get(alt_mapping)[DEFAULT_MAPPING_NAME]]`
	`200`	`+returnself._get_source_mappings_by_fields_and_log_sources(`
	`201`	`+field_names,log_sources,self._alternative_mappings.get(alt_mapping, {})`
`209`	`202`	`)`
`210`	`203`
`211`	`204`	`defget_source_mapping(self,source_id:str)->Optional[SourceMapping]:`

`‎uncoder-core/app/translator/mappings/utils/load_from_files.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def load_mapping(mapping_file_path: str) -> dict:`
`22`	`22`	`print(err)`
`23`	`23`	`return {}`
`24`	`24`
`25`		`-defget_platform_alternative_mappings(self,platform_dir:str)->dict[str:str]:`
	`25`	`+defget_platform_alternative_mappings_dirs(self,platform_dir:str)->dict[str:str]:`
`26`	`26`	`platform_path=os.path.join(self.base_mapping_filepath,platform_dir,ALTERNATIVE_MAPPINGS_FOLDER_NAME)`
`27`	`27`	`for_,dirs,_inos.walk(platform_path):`
`28`	`28`	`result= {}`

`‎uncoder-core/app/translator/platforms/microsoft/parsers/microsoft_sentinel.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain`
`50`	`50`	`query_tokens,functions.functions`
`51`	`51`	`)`
`52`	`52`	`source_mappings=self.get_source_mappings(`
`53`		`-field_tokens=query_field_tokens+function_field_tokens,`
	`53`	`+field_tokens=query_field_tokens+function_field_tokens,`
`54`	`54`	`log_sources=log_sources,`
`55`		`-alt_mapping=raw_query_container.meta_info.source_alt_mapping`
	`55`	`+alt_mapping=raw_query_container.meta_info.source_alt_mapping,`
`56`	`56`	`)`
`57`	`57`	`meta_info=raw_query_container.meta_info`
`58`	`58`	`meta_info.query_fields=query_field_tokens`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commited36ada

File tree

3 files changed

3 files changed

`‎uncoder-core/app/translator/core/mapping.py‎`

`‎uncoder-core/app/translator/mappings/utils/load_from_files.py‎`

`‎uncoder-core/app/translator/platforms/microsoft/parsers/microsoft_sentinel.py‎`

0 commit comments