Merge

Pipfile

@@ -4,15 +4,15 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-cryptography = "==3.4.8"
+cryptography = "==37.0.4"
 crcmod = "==1.7"
 future = "==0.17.1"
-protobuf = "==3.20.3"
-psutil = "==5.7.0"
+protobuf = "==4.23.4"
+psutil = "==5.9.4"
 
 [dev-packages]
 Fabric = "==1.14.1"
-grpcio-tools = "==1.38.0"
+grpcio-tools = "==1.62.2"
 gunicorn = "*"
 isort = "*"
 nodeenv = "==1.0.0"

docker/base/setup_clusterfuzz.sh

@@ -37,14 +37,14 @@ if [[ -z "$DISABLE_MOUNTS" ]]; then
   mount -t tmpfs -o size=10M,mode=777 tmpfs $INSTALL_DIRECTORY/clusterfuzz/bot/logs/
   mount -t tmpfs -o size=90M,mode=777 tmpfs $BOT_TMPDIR
 
-  # Setup mount to limit disk space for fuzzer-testcases-disk directory.
+  # Setup mount to limit disk space for fuzzer testcases disk directory.
   FUZZER_TESTCASES_DISK_FILE=$INSTALL_DIRECTORY/fuzzer-testcases.mnt
   fallocate -l 8GiB $FUZZER_TESTCASES_DISK_FILE
   mkfs.ext4 -F $FUZZER_TESTCASES_DISK_FILE
 
   # mkfs.ext4 seems to remove the previous allocation, so do it again.
   fallocate -l 8GiB $FUZZER_TESTCASES_DISK_FILE
-  mount -o loop $FUZZER_TESTCASES_DISK_FILE $INSTALL_DIRECTORY/clusterfuzz/bot/inputs/fuzzer-testcases-disk
+  mount -o loop $FUZZER_TESTCASES_DISK_FILE $INSTALL_DIRECTORY/clusterfuzz/bot/inputs/disk
 fi
 
 chown -R $USER:$USER $INSTALL_DIRECTORY

docker/build.sh

@@ -19,6 +19,7 @@ IMAGES=(
   gcr.io/clusterfuzz-images/chromium/base
   gcr.io/clusterfuzz-images/chromium/builder
   gcr.io/clusterfuzz-images/chromium/high-end
+  gcr.io/clusterfuzz-images/chromium/tester
   gcr.io/clusterfuzz-images/chromium/tests-syncer
   gcr.io/clusterfuzz-images/oss-fuzz/base
   gcr.io/clusterfuzz-images/oss-fuzz/host
@@ -34,7 +35,7 @@ function docker_push {
   docker push $image:$stamp
 }
 
-GIT_HASH=$1
+GIT_HASH=`git rev-parse HEAD | head -c7`
 stamp=$GIT_HASH-$(date -u +%Y%m%d%H%M)
 for image in "${IMAGES[@]}"; do
   docker build -t $image ${image#gcr.io/clusterfuzz-images/}

src/clusterfuzz/_internal/bot/fuzzers/libFuzzer/peach/__init__.py → docker/chromium/tester/Dockerfile

@@ -1,13 +1,16 @@
-# Copyright 2020 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+FROM gcr.io/clusterfuzz-images/chromium/base
+
+ENV USE_TEST_DEPLOYMENT True

docs/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.9)
+    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)
@@ -205,13 +205,13 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.19.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (4.25.1)
@@ -224,7 +224,8 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (3.26.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -239,6 +240,7 @@ GEM
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
+    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)