[CIfuzz] Fix SARIF functionality. (#10349)

Author: jonathanmetzman

infra/cifuzz/sarif_utils.py

@@ -162,11 +162,13 @@ def get_error_frame(crash_info):
   if not crash_info.crash_state:
     return None
   state = crash_info.crash_state.split('\n')[0]
+  logging.info('state: %s frames %s, %s', state, crash_info.frames,
+               [f.function_name for f in crash_info.frames[0]])
 
   for crash_frames in crash_info.frames:
     for frame in crash_frames:
       # TODO(metzman): Do something less fragile here.
-      if frame.function_name.startswith(state):
+      if state in frame.function_name:
         return frame
   return None
 
@@ -205,9 +207,9 @@ def get_sarif_data(stacktrace, target_path):
                                          include_ubsan=True)
   crash_info = stack_parser.parse(stacktrace)
   error_source_info = get_error_source_info(crash_info)
-  uri = error_source_info[0]
   rule_idx = get_rule_index(crash_info.crash_type)
   rule_id = SARIF_RULES[rule_idx]['id']
+  uri = error_source_info[0]
 
   result = {
       'level': 'error',
@@ -230,7 +232,8 @@ def get_sarif_data(stacktrace, target_path):
       'ruleId': rule_id,
       'ruleIndex': rule_idx
   }
-  data['runs'][0]['results'].append(result)
+  if uri:
+    data['runs'][0]['results'].append(result)
   return data
 
 

infra/cifuzz/sarif_utils_test.py

@@ -12,13 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Tests for sarif_utils.py"""
+import copy
+import os
 import unittest
 from unittest import mock
 
 import sarif_utils
 
 CRASH_INFO_FILELINE = 403
 
+TEST_DATA = os.path.join(os.path.dirname(__file__), 'test_data')
+
 
 class GetSarifDataTest(unittest.TestCase):
   """Tests for get_sarif_data."""
@@ -31,6 +35,45 @@ def test_get_sarif_data_none(self):
     self.assertEqual(sarif_utils.get_sarif_data(None, '/root/target'),
                      sarif_utils.SARIF_DATA)
 
+  def test_ordinary_case(self):
+    stacktrace_filename = os.path.join(TEST_DATA,
+                                       'sarif_utils_systemd_stack.txt')
+    with open(stacktrace_filename, 'r') as fp:
+      stacktrace = fp.read()
+    expected_result = {
+        'level': 'error',
+        'message': {
+            'text': 'Heap-buffer-overflow\nREAD 4'
+        },
+        'locations': [{
+            'physicalLocation': {
+                'artifactLocation': {
+                    'uri': 'src/core/fuzz-unit-file.c',
+                    'index': 0
+                },
+                'region': {
+                    'startLine': 30,
+                    # We don't have this granualarity fuzzing.
+                    'startColumn': 1,
+                }
+            }
+        }],
+        'ruleId': 'heap-buffer-overflow',
+        'ruleIndex': 2
+    }
+    actual_result = sarif_utils.get_sarif_data(
+        stacktrace, '/root/target')['runs'][0]['results'][0]
+    self.assertEqual(actual_result, expected_result)
+
+  def test_llvmfuzzertestoneinput_case(self):
+    stacktrace_filename = os.path.join(TEST_DATA,
+                                       'sarif_utils_only_llvmfuzzer_stack.txt')
+    with open(stacktrace_filename, 'r') as fp:
+      stacktrace = fp.read()
+    actual_result = sarif_utils.get_sarif_data(
+        stacktrace, '/root/target')['runs'][0]['results']
+    self.assertEqual(actual_result, [])
+
 
 class RedactSrcPathTest(unittest.TestCase):
   """Tests for redact_src_path."""