Commit009683e

authored

Merge pull request#158 from UncoderIO/gis-8085

GIS-8085 Improve StrictPlatformException and mapping

2 parents7606f21 +a0ee2ba commit009683eCopy full SHA for 009683e

File tree

+31

-5

lines changed

+31

-5

lines changed

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+fromtypingimportOptional`
	`2`	`+`
	`3`	`+`
`1`	`4`	`classNotImplementedException(BaseException):`
`2`	`5`	`...`
`3`	`6`
`@@ -7,8 +10,17 @@ class BasePlatformException(BaseException):`
`7`	`10`
`8`	`11`
`9`	`12`	`classStrictPlatformException(BasePlatformException):`
`10`		`-def__init__(self,platform_name:str,field_name:str):`
`11`		`-message=f"Platform{platform_name} has strict mapping. Source field{field_name} has no mapping."`
	`13`	`+field_name:str=None`
	`14`	`+`
	`15`	`+def__init__(`
	`16`	`+self,platform_name:str,field_name:str,mapping:str=None,detected_fields:Optional[list]=None`
	`17`	`+ ):`
	`18`	`+message= (`
	`19`	`+f"Platform{platform_name} has strict mapping. "`
	`20`	`+f"Source fields:{', '.join(detected_fields)ifdetected_fieldselsefield_name} has no mapping."`
	`21`	`+f" Mapping file:{mapping}."ifmappingelse""`
	`22`	`+ )`
	`23`	`+self.field_name=field_name`
`12`	`24`	`super().__init__(message)`
`13`	`25`
`14`	`26`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -263,8 +263,16 @@ def apply_token(self, token: Union[FieldValue, Keyword, Identifier], source_mapp`
`263`	`263`
`264`	`264`	`defgenerate_query(self,tokens:list[TOKEN_TYPE],source_mapping:SourceMapping)->str:`
`265`	`265`	`result_values= []`
	`266`	`+not_found_mapping_fields=set()`
`266`	`267`	`fortokenintokens:`
`267`		`-result_values.append(self.apply_token(token=token,source_mapping=source_mapping))`
	`268`	`+try:`
	`269`	`+result_values.append(self.apply_token(token=token,source_mapping=source_mapping))`
	`270`	`+exceptStrictPlatformExceptionaserr:`
	`271`	`+not_found_mapping_fields.add(err.field_name)`
	`272`	`+ifnot_found_mapping_fields:`
	`273`	`+raiseStrictPlatformException(`
	`274`	`+self.details.name,"",source_mapping.source_id,sorted(list(not_found_mapping_fields))`
	`275`	`+ )`
`268`	`276`	`return"".join(result_values)`
`269`	`277`
`270`	`278`	`defwrap_query_with_meta_info(self,meta_info:MetaInfoContainer,query:str)->str:`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,3 +125,4 @@ field_mapping:`
`125`	`125`	`SourceOS:xdm.source.host.os`
`126`	`126`	`DestinationOS:xdm.target.host.os`
`127`	`127`	`url_category:xdm.network.http.url_category`
	`128`	`+EventSeverity:xdm.alert.severity`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,12 @@ field_mapping:`
`13`	`13`	`dst-port:`
`14`	`14`	`-DstPort`
`15`	`15`	`-DestinationPort`
	`16`	`+ -remoteport`
`16`	`17`	`dst-hostname:DstHost`
`17`	`18`	`src-hostname:SrcHost`
`18`		`-src-port:SourcePort`
	`19`	`+src-port:`
	`20`	`+ -SourcePort`
	`21`	`+ -localport`
`19`	`22`	`src-ip:`
`20`	`23`	`-sourceip`
`21`	`24`	`-source_ip`
`@@ -27,6 +30,7 @@ field_mapping:`
`27`	`30`	`-destination_ip`
`28`	`31`	`-destinationIP`
`29`	`32`	`-destinationaddress`
	`33`	`+ -destination`
`30`	`34`	`User:`
`31`	`35`	`-userName`
`32`	`36`	`-EventUserName`
`@@ -64,4 +68,5 @@ field_mapping:`
`64`	`68`	`DestinationOS:DestinationOS`
`65`	`69`	`TargetUserName:DestinationUserName`
`66`	`70`	`SourceUserName:SourceUserName`
`67`		`-url_category:XForceCategoryByURL`
	`71`	`+url_category:XForceCategoryByURL`
	`72`	`+EventSeverity:EventSeverity`

Comments

(0)