Skip to content

feat(workers): add logging to verify oss-fuzz-specific tasks #4041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelkedar merged 5 commits into from
Oct 1, 2025
Merged

feat(workers): add logging to verify oss-fuzz-specific tasks #4041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39e1fd7
feat(workers): add logging to verify oss-fuzz-specific tasks
michaelkedar Sep 25, 2025
28b7d70
Merge branch 'master' into fuzznt
michaelkedar Oct 1, 2025
54ad479
imp tests
michaelkedar Oct 1, 2025
586dfb2
denylist -> allowlist
michaelkedar Oct 1, 2025
36b27e3
nobody expects the spanish inquisition
michaelkedar Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion gcp/workers/importer/importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,15 @@ def _request_analysis_external(self,
path,
deleted=False):
"""Request analysis."""
# TODO(michaelkedar): Making a distinction for oss-fuzz updates so we can
# track the logic flow for our eventual decoupling of the special logic.
task_type = 'update'
if source_repo.name == 'oss-fuzz':
task_type = 'update-oss-fuzz'
self._publisher.publish(
self._tasks_topic,
data=b'',
type='update',
type=task_type,
source=source_repo.name,
path=path,
original_sha256=original_sha256,
Expand Down
4 changes: 2 additions & 2 deletions gcp/workers/importer/importer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def test_basic(self, unused_mock_time: mock.MagicMock,
'19a3cd03fc15360bf16187f54df92a75'),
path='2021-111.yaml',
source='oss-fuzz',
type='update',
type='update-oss-fuzz',
req_timestamp='12345')
])
bug = osv.Bug.get_by_id('OSV-2017-134')
Expand Down Expand Up @@ -357,7 +357,7 @@ def test_scheduled_updates(self, unused_mock_time: mock.MagicMock,
'19a3cd03fc15360bf16187f54df92a75'),
path='proj/OSV-2021-1337.yaml',
source='oss-fuzz',
type='update',
type='update-oss-fuzz',
req_timestamp='12345'),
mock.call(
self.tasks_topic,
Expand Down
17 changes: 17 additions & 0 deletions gcp/workers/worker/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,20 @@ def _do_process_task(self, subscriber, subscription, ack_id, message,
_state.bug_id = message.attributes.get('allocated_bug_id', None)

task_type = message.attributes['type']

# Validating that oss-fuzz-related tasks are only sent by oss-fuzz and
# the non-oss-fuzz task is not used by oss-fuzz.
if not source_id:
logging.error('got message without source_id: %s', message)
elif source_id.startswith('oss-fuzz'):
if task_type not in ('regressed', 'fixed', 'impact', 'invalid',
'update-oss-fuzz'):
logging.error('got unexpected \'%s\' task for oss-fuzz source %s',
task_type, source_id)
elif task_type != 'update':
logging.error('got unexpected \'%s\' task for non-oss-fuzz source %s',
task_type, source_id)

if task_type in ('regressed', 'fixed'):
oss_fuzz.process_bisect_task(self._oss_fuzz_dir, task_type, source_id,
message)
Expand All @@ -631,6 +645,9 @@ def _do_process_task(self, subscriber, subscription, ack_id, message,
logging.exception('Failed to process impact: ')
elif task_type == 'invalid':
mark_bug_invalid(message)
elif task_type == 'update-oss-fuzz':
# TODO(michaelkedar): create separate _source_update for oss-fuzz.
self._source_update(message)
elif task_type == 'update':
self._source_update(message)

Expand Down
Loading