From 8d2a70ad76dd791a1f26c4c98f2e2073c9694f3f Mon Sep 17 00:00:00 2001
From: Paulo Borges <paulovlb@google.com>
Date: Wed, 17 Jun 2026 16:05:22 +0000
Subject: [PATCH] Add checkbox and new field 'untrusted' in fuzzer

---
 src/appengine/handlers/fuzzers.py             | 12 ++++
 .../components/fuzzers-page/edit-form.html    | 10 ++-
 .../_internal/datastore/data_types.py         |  3 +
 .../tests/appengine/handlers/fuzzers_test.py  | 66 +++++++++++++++++++
 .../tests/core/datastore/data_types_test.py   |  1 +
 5 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/src/appengine/handlers/fuzzers.py b/src/appengine/handlers/fuzzers.py
index e1f5e1e1466..af09eec9649 100644
--- a/src/appengine/handlers/fuzzers.py
+++ b/src/appengine/handlers/fuzzers.py
@@ -174,6 +174,7 @@ def apply_fuzzer_changes(self, fuzzer, upload_info):
     timeout = self._get_integer_value('timeout')
     max_testcases = self._get_integer_value('max_testcases')
     external_contribution = request.get('external_contribution', False)
+    untrusted = request.get('untrusted', False)
     differential = request.get('differential', False)
     environment_string = request.get('additional_environment_string')
     data_bundle_name = request.get('data_bundle_name')
@@ -193,6 +194,7 @@ def apply_fuzzer_changes(self, fuzzer, upload_info):
     fuzzer.sample_testcase = None
     fuzzer.console_output = None
     fuzzer.external_contribution = bool(external_contribution)
+    fuzzer.untrusted = bool(untrusted)
     fuzzer.differential = bool(differential)
     fuzzer.additional_environment_string = environment_string
     fuzzer.timestamp = datetime.datetime.now(tz=datetime.timezone.utc).replace(
@@ -208,6 +210,16 @@ def apply_fuzzer_changes(self, fuzzer, upload_info):
     if launcher_script:
       fuzzer.launcher_script = launcher_script
 
+    if fuzzer.untrusted:
+      for job_name in jobs:
+        job = data_types.Job.query(data_types.Job.name == job_name).get()
+        if not job:
+          raise helpers.EarlyExitError(f'Job {job_name} not found.', 400)
+        if job.platform.lower() != 'linux':
+          raise helpers.EarlyExitError(
+              f'Untrusted fuzzers can only be run on Linux jobs. '
+              f'Job "{job_name}" has platform "{job.platform}".', 400)
+
     fuzzer.put()
 
     fuzzer_selection.update_mappings_for_fuzzer(fuzzer)
diff --git a/src/appengine/private/components/fuzzers-page/edit-form.html b/src/appengine/private/components/fuzzers-page/edit-form.html
index fb1e41886e8..e1aa340fa49 100644
--- a/src/appengine/private/components/fuzzers-page/edit-form.html
+++ b/src/appengine/private/components/fuzzers-page/edit-form.html
@@ -220,11 +220,16 @@
       </div>
       <div class="inline narrow">
         <paper-checkbox checked="{{fuzzer.external_contribution}}">External contribution</paper-checkbox>
+      </div>
+      <div class="inline narrow">
+        <paper-checkbox checked="{{fuzzer.untrusted}}">Untrusted</paper-checkbox>
+      </div>
 
-        <!-- TODO: Re-enable after the differential fuzzing is implemented.
+      <!-- TODO: Re-enable after the differential fuzzing is implemented.
+      <div class="inline narrow">
         <paper-checkbox checked="{{fuzzer.differential}}">Differential fuzzer</paper-checkbox>
-        -->
       </div>
+      -->
     </ajax-dialog>
     <iron-ajax
       id="ajaxFinish"
@@ -257,6 +262,7 @@
                 'max_testcases',
                 'name',
                 'timeout',
+                'untrusted',
             ],
           },
           file: Object,
diff --git a/src/clusterfuzz/_internal/datastore/data_types.py b/src/clusterfuzz/_internal/datastore/data_types.py
index e648a58bea3..eb357445207 100644
--- a/src/clusterfuzz/_internal/datastore/data_types.py
+++ b/src/clusterfuzz/_internal/datastore/data_types.py
@@ -353,6 +353,9 @@ class Fuzzer(Model):
   # Does it run un-trusted content ? Examples including running live sites.
   untrusted_content = ndb.BooleanProperty(default=False)
 
+  # Is this fuzzer untrusted? (VRP support)
+  untrusted = ndb.BooleanProperty(default=False)
+
   # Data bundle name.
   data_bundle_name = ndb.StringProperty(default='')
 
diff --git a/src/clusterfuzz/_internal/tests/appengine/handlers/fuzzers_test.py b/src/clusterfuzz/_internal/tests/appengine/handlers/fuzzers_test.py
index 14268e5eecb..8f7e636a142 100644
--- a/src/clusterfuzz/_internal/tests/appengine/handlers/fuzzers_test.py
+++ b/src/clusterfuzz/_internal/tests/appengine/handlers/fuzzers_test.py
@@ -179,6 +179,7 @@ def test_update_fuzzer(self):
             'additional_environment_string': 'args=123',
             'data_bundle_name': 'test_bundle',
             'external_contribution': True,
+            'untrusted': False,
             'executable_path': 'executable',
             'last_edited_by': 'editor@example.com',
             'launcher_script': 'launcher',
@@ -188,3 +189,68 @@ def test_update_fuzzer(self):
             'source': 'original@example.com',
             'timeout': 30,
         })
+
+  def test_update_fuzzer_untrusted_success(self):
+    """Test updating a fuzzer to untrusted with a Linux job succeeds."""
+    # Create a Linux job.
+    job = data_types.Job(name='linux_job', platform='LINUX')
+    job.put()
+
+    fuzzer_name = 'test_fuzzer'
+    fuzzer = data_types.Fuzzer(
+        name=fuzzer_name,
+        jobs=[],
+        revision=1,
+        source='original@example.com',
+        timeout=10,
+    )
+    fuzzer.put()
+
+    request_payload = {
+        'csrf_token': form.generate_csrf_token(),
+        'key': fuzzer.key.id(),
+        'name': fuzzer_name,
+        'untrusted': True,
+        'jobs': ['linux_job'],
+    }
+
+    resp = self.app.post_json('/fuzzers/edit', request_payload)
+    self.assertEqual(302, resp.status_int)  # Redirects to /fuzzers
+
+    fuzzer = fuzzer.key.get()
+    self.assertTrue(fuzzer.untrusted)
+    self.assertEqual(fuzzer.jobs, ['linux_job'])
+
+  def test_update_fuzzer_untrusted_failure_non_linux(self):
+    """Test updating a fuzzer to untrusted with a non-Linux job fails."""
+    # Create a Windows job.
+    job = data_types.Job(name='windows_job', platform='WINDOWS')
+    job.put()
+
+    fuzzer_name = 'test_fuzzer'
+    fuzzer = data_types.Fuzzer(
+        name=fuzzer_name,
+        jobs=[],
+        revision=1,
+        source='original@example.com',
+        timeout=10,
+    )
+    fuzzer.put()
+
+    request_payload = {
+        'csrf_token': form.generate_csrf_token(),
+        'key': fuzzer.key.id(),
+        'name': fuzzer_name,
+        'untrusted': True,
+        'jobs': ['windows_job'],
+    }
+
+    resp = self.app.post_json(
+        '/fuzzers/edit', request_payload, expect_errors=True)
+    self.assertEqual(400, resp.status_int)
+    self.assertIn('Untrusted fuzzers can only be run on Linux jobs',
+                  resp.normal_body.decode())
+
+    # Verify fuzzer was not updated to untrusted.
+    fuzzer = fuzzer.key.get()
+    self.assertFalse(fuzzer.untrusted)
diff --git a/src/clusterfuzz/_internal/tests/core/datastore/data_types_test.py b/src/clusterfuzz/_internal/tests/core/datastore/data_types_test.py
index 489c74ce165..45ebf353b3c 100644
--- a/src/clusterfuzz/_internal/tests/core/datastore/data_types_test.py
+++ b/src/clusterfuzz/_internal/tests/core/datastore/data_types_test.py
@@ -56,6 +56,7 @@ def test_get_config_dict(self):
             'revision': 3,
             'source': 'author',
             'last_edited_by': 'editor',
+            'untrusted': False,
         },
         config_dict,
     )