Fix AttributeError: 'NoneType' object has no attribute 'corpus_pruning_task_input' (#4168)

This was caused by the roll forward of oss-fuzz.

Author: jonathanmetzman

src/clusterfuzz/_internal/bot/tasks/utasks/corpus_pruning_task.py

@@ -66,7 +66,7 @@
 
 # Time to allow libFuzzer to timeout on its own.
 SINGLE_UNIT_TIMEOUT = 5
-TIMEOUT_FLAG = '-timeout=%d' % SINGLE_UNIT_TIMEOUT
+TIMEOUT_FLAG = f'-timeout={SINGLE_UNIT_TIMEOUT}'
 
 # Corpus files limit for cases when corpus pruning task failed in the last
 # execution.
@@ -177,7 +177,7 @@ def __init__(self, uworker_input, fuzz_target, cross_pollinate_fuzzers):
     self.merge_tmp_dir = None
     self.engine = engine.get(self.fuzz_target.engine)
     if not self.engine:
-      raise CorpusPruningError('Engine {} not found'.format(engine))
+      raise CorpusPruningError(f'Engine {engine} not found')
 
     self._created_directories = []
 
@@ -593,15 +593,15 @@ def _record_cross_pollination_stats(output):
   client.insert([big_query.Insert(row=bigquery_row, insert_id=None)])
 
 
-def do_corpus_pruning(context, revision):
+def do_corpus_pruning(uworker_input, context, revision):
   """Run corpus pruning."""
   # Set |FUZZ_TARGET| environment variable to help with unarchiving only fuzz
   # target and its related files.
   environment.set_value('FUZZ_TARGET', context.fuzz_target.binary)
 
   if environment.is_trusted_host():
     from clusterfuzz._internal.bot.untrusted_runner import tasks_host
-    return tasks_host.do_corpus_pruning(context, revision)
+    return tasks_host.do_corpus_pruning(uworker_input, context, revision)
 
   if not build_manager.setup_build(revision=revision):
     raise CorpusPruningError('Failed to setup build.')
@@ -1012,7 +1012,7 @@ def utask_main(uworker_input):
 
   uworker_output = None
   try:
-    result = do_corpus_pruning(context, revision)
+    result = do_corpus_pruning(uworker_input, context, revision)
     issue_metadata = engine_common.get_fuzz_target_issue_metadata(fuzz_target)
     issue_metadata = issue_metadata or {}
     _upload_corpus_crashes_zip(

src/clusterfuzz/_internal/bot/untrusted_runner/tasks_host.py

@@ -39,7 +39,7 @@ def _fuzz_target_to_proto(fuzz_target):
   )
 
 
-def do_corpus_pruning(context, revision):
+def do_corpus_pruning(uworker_input, context, revision):
   """Do corpus pruning on untrusted worker."""
   cross_pollinate_fuzzers = [
       untrusted_runner_pb2.CrossPollinateFuzzer(
@@ -52,7 +52,8 @@ def do_corpus_pruning(context, revision):
   request = untrusted_runner_pb2.PruneCorpusRequest(
       fuzz_target=_fuzz_target_to_proto(context.fuzz_target),
       cross_pollinate_fuzzers=cross_pollinate_fuzzers,
-      revision=revision)
+      revision=revision,
+      uworker_input=uworker_input)
 
   response = host.stub().PruneCorpus(request)
 

src/clusterfuzz/_internal/bot/untrusted_runner/tasks_impl.py

@@ -44,12 +44,13 @@ def _proto_to_cross_pollinate_fuzzer(proto):
 def prune_corpus(request, _):
   """Prune corpus."""
   context = corpus_pruning_task.Context(
-      None, _proto_to_fuzz_target(request.fuzz_target), [
+      request.uworker_input, _proto_to_fuzz_target(request.fuzz_target), [
           _proto_to_cross_pollinate_fuzzer(proto)
           for proto in request.cross_pollinate_fuzzers
       ])
 
-  result = corpus_pruning_task.do_corpus_pruning(context, request.revision)
+  result = corpus_pruning_task.do_corpus_pruning(request.uworker_input, context,
+                                                 request.revision)
 
   cross_pollination_stats = None
   if result.cross_pollination_stats:

src/clusterfuzz/_internal/protos/untrusted_runner.proto

@@ -15,7 +15,7 @@
 syntax = "proto2";
 
 import "google/protobuf/any.proto";
-
+import "clusterfuzz/_internal/protos/uworker_msg.proto";
 option go_package = "clusterfuzz/protos/untrusted_runner";
 
 message GetStatusRequest {
@@ -214,6 +214,7 @@ message PruneCorpusRequest {
   repeated CrossPollinateFuzzer cross_pollinate_fuzzers = 2;
   optional bool last_execution_failed = 4;
   optional int64 revision = 5;
+  optional uworker_msg.Input uworker_input = 6;
 }
 
 message PruneCorpusResponse {

src/clusterfuzz/_internal/protos/untrusted_runner_pb2.py

@@ -14,6 +14,8 @@
 
 syntax = "proto3";
 
+package uworker_msg;
+
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";