Merge pull request #11644 from Azure/v-sabiraj-crowdstrikev2-jsondecoder

Updated code to handle JSON decode error
Azure · Jan 13, 2025 · fafd0a9 · fafd0a9
2 parents 387b404 + 80097c6
commit fafd0a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...Protection/Data Connectors/CrowdstrikeReplicatorCLv2/CrowdstrikeFalconAPISentinelConn.zip b/...Protection/Data Connectors/CrowdstrikeReplicatorCLv2/CrowdstrikeFalconAPISentinelConn.zip
diff --git a/...ors/CrowdstrikeReplicatorCLv2/CrowdstrikeFalconAPISentinelConn/QueueTriggerCS/__init__.py b/...ors/CrowdstrikeReplicatorCLv2/CrowdstrikeFalconAPISentinelConn/QueueTriggerCS/__init__.py
@@ -106,7 +106,12 @@ async def main(msg: func.QueueMessage) -> None:
 # requireRaw : bool
 def customize_event(line, eventsSchemaMappingDict, requiredFieldsMappingDict, requireRaw):
 
-    element = json.loads(line)
+    try:
+        element = json.loads(line)  # Attempt to parse the line as JSON
+    except json.JSONDecodeError as e:
+        # Log the error and skip this line
+        logging.error(f"JSON decoding error for line: {line}. Error: {str(e)}")
+        return None, None
     if "event_simpleName" in element and element["event_simpleName"] in eventsSchemaMappingDict:
         schema = eventsSchemaMappingDict[element["event_simpleName"]]
     else:
@@ -201,13 +206,14 @@ async def process_file_primary_CLv2(bucket, s3_path, client, session, eventsSche
                         if line:
                             try:
                                 normalizedEvent, customizedEvent = customize_event(line, eventsSchemaMappingDict, requiredFieldsMappingDict, REQUIRE_RAW)
-                            except ValueError as e:
-                                logging.error('Error while loading json Event at s value {}. Error: {}'.format(line, str(e)))
-                                raise e
+                                if normalizedEvent is None:  # Skip this line if it's invalid
+                                    continue
                             except Exception as e:
-                                logging.error(e)
-                            await normalizedSentinelHelperCollection.sendData(normalizedEvent)
-                            if REQUIRE_RAW:
+                                logging.error(f"Error while processing line: {line}. Error: {str(e)}")
+                                continue
+                            if normalizedEvent:
+                                await normalizedSentinelHelperCollection.sendData(normalizedEvent)
+                            if REQUIRE_RAW and customizedEvent:
                                 await customizedSentinelHelperCollection.sendData(customizedEvent)
                 s = line
             if s: