PSEC-1167 Improve rust_fuzz_test_binary

Author: venkkatesh-sekar

.bazelrc

@@ -119,7 +119,7 @@ build:check --output_groups=build_metadata
 # Fuzzing configuration
 build:fuzzing --@rules_rust//rust/toolchain/channel=nightly
 build:fuzzing --build_tag_filters=fuzz_test
-# TODO(PSEC-1167) Move from define to transition in fuzz_testing.bzl
+# Ignoring transitions for now since it doesn't add any additional improvement to current setup.
 build:fuzzing --//bazel:enable_fuzzing_code=True
 
 # Suppress all additional output to make it more convenient in scripts

bazel/fuzz_testing.bzl

@@ -19,20 +19,31 @@ RUSTC_FLAGS_DEFAULTS_FOR_FUZZING = [
     "-Zsanitizer=address",
 ]
 
-def rust_fuzz_test_binary(name, srcs, proc_macro_deps = [], deps = []):
-    # Builds the fuzzer using the Rust nightly toolchain so it can be run by libfuzzer. The fuzzer must be compiled using
-    # Rust nightly, e.g.
-    # bazel run --@rules_rust//rust/toolchain/channel=nightly --build_tag_filters=fuzz_test //rs/types/ic00_types/fuzz:decode_install_code_args
+def rust_fuzz_test_binary(name, srcs, rustc_flags = [], crate_features = [], proc_macro_deps = [], deps = [], **kwargs):
+    """Wrapper for the rust_binary to compile a fuzzing rust_binary
+
+    Args:
+      name: name of the fuzzer target.
+      srcs: source files for the fuzzer.
+      rustc_flags: Additional rustc_flags for rust_binary rule. This facilitates using additional sanitizers to the fuzzer target.
+            Address sanitizer is added by default.
+      crate_features: Additional crate_features to be used for compilation.
+            fuzzing is added by default.
+      deps: Fuzzer dependencies.
+      proc_macro_deps: Fuzzer proc_macro dependencies.
+      **kwargs: additional arguments to pass a rust_binary rule.
+    """
     rust_binary(
         name = name,
         srcs = srcs,
         aliases = {},
-        crate_features = ["fuzzing"],
+        crate_features = crate_features + ["fuzzing"],
         proc_macro_deps = proc_macro_deps,
         deps = deps,
-        rustc_flags = RUSTC_FLAGS_DEFAULTS_FOR_FUZZING,
+        rustc_flags = rustc_flags + RUSTC_FLAGS_DEFAULTS_FOR_FUZZING,
         tags = [
             # Makes sure this target is not run in normal CI builds. It would fail due to non-nightly Rust toolchain.
             "fuzz_test",
         ],
+        **kwargs
     )

bin/build-all-fuzzers.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# A utility script to build all fuzzers on the IC in a single directory.
+# TODO(PSEC-998) - Precursor to a scheduled CI pipeline which will upload these to Clusterfuzz via gsutil
+set -euo pipefail
+
+case $1 in
+    -h | --help)
+        cat <<EOF >&2
+        usage:
+            $0 --bin path/to/dir/   # builds all fuzzing binaries in the given directory.           
+            $0 --zip path/to/dir/   # builds and zips' all binaries in given directory. Includes a version.txt file with sha256sum.
+EOF
+        exit 0
+        ;;
+    --bin | --zip)
+        if [ -z "${2-}" ]; then
+            echo "No directory provided. Using fuzzer_build/"
+            BUILD_DIR="fuzzer_build/"
+        else
+            echo "Using $2 for building"
+            BUILD_DIR=$2
+        fi
+        CLUSTERFUZZ_ZIP_PREFIX="libfuzzer_linux"
+        LIST_OF_FUZZERS=$(bazel query 'attr(tags, "fuzz_test", //rs/...)')
+        # ui_event_filters to suppress WARNING: info command does not support starlark options
+        WORKSPACE=$(bazel info workspace --ui_event_filters=-WARNING,-INFO 2>/dev/null)
+        mkdir -p $BUILD_DIR
+        cd $BUILD_DIR
+        for FUZZER in $LIST_OF_FUZZERS; do
+            bazel build --config=fuzzing $FUZZER
+            SOURCE_BINARY="$WORKSPACE/$(bazel cquery --config=fuzzing --output=files $FUZZER)"
+            if [ $1 == "--bin" ]; then
+                cp -p $SOURCE_BINARY .
+            else # zip branch
+                SOURCE_BASENAME=$(basename $SOURCE_BINARY)
+                # gzip -c $SOURCE_BINARY > "${CLUSTERFUZZ_ZIP_PREFIX}_${SOURCE_BASENAME}.gz"
+                zip -j "${CLUSTERFUZZ_ZIP_PREFIX}_${SOURCE_BASENAME}.zip" $SOURCE_BINARY
+                echo $(sha256sum "${CLUSTERFUZZ_ZIP_PREFIX}_${SOURCE_BASENAME}.zip") >>version.txt
+            fi
+        done
+        ;;
+esac

rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/fuzz/fuzz_targets/cbor_deserialize_dealing.rs

@@ -5,7 +5,7 @@ use ic_crypto_internal_threshold_sig_ecdsa::IDkgDealingInternal;
 
 // This fuzzer tries to find panics in CBOR deserialization of dealings. We ignore errors
 // returned by the decoding, as these do not lead to panics. You can run the fuzzer locally:
-// bazel run --@rules_rust//rust/toolchain/channel=nightly --build_tag_filters=fuzz_test //rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/fuzz:cbor_deserialize_dealing
+// bazel run --config=fuzzing //rs/crypto/internal/crypto_lib/threshold_sig/tecdsa/fuzz:cbor_deserialize_dealing
 fuzz_target!(|data: &[u8]| {
     let _ = IDkgDealingInternal::deserialize(data);
 });

rs/embedders/fuzz/fuzz_targets/compile_wasm_using_embedder.rs

@@ -17,7 +17,7 @@ use wasm_smith::MaybeInvalidModule;
 // The fuzz test is only compiled but not executed by CI.
 //
 // To execute the fuzzer run
-// bazel run --@rules_rust//rust/toolchain/channel=nightly --build_tag_filters=fuzz_test //rs/embedders/fuzz:embedders_fuzzer -- corpus/
+// bazel run --config=fuzzing //rs/embedders/fuzz:compile_wasm_using_embedder -- corpus/
 
 fuzz_target!(|module: MaybeInvalidModule| {
     let config = EmbeddersConfig::default();

rs/embedders/fuzz/fuzz_targets/execute_with_wasm_executor.rs

@@ -38,7 +38,7 @@ use wasm_smith::ConfiguredModule;
 // The fuzz test is only compiled but not executed by CI.
 //
 // To execute the fuzzer run
-// bazel run --@rules_rust//rust/toolchain/channel=nightly --build_tag_filters=fuzz_test //rs/embedders/fuzz:execute_with_wasm_executor -- corpus/
+// bazel run --config=fuzzing --build_tag_filters=fuzz_test //rs/embedders/fuzz:execute_with_wasm_executor -- corpus/
 
 fuzz_target!(|module: ConfiguredModule<ICWasmConfig>| {
     let wasm = module.module.to_bytes();

rs/embedders/fuzz/fuzz_targets/execute_with_wasmtime.rs

@@ -11,7 +11,7 @@ use wasm_smith::ConfiguredModule;
 // The fuzz test is only compiled but not executed by CI.
 //
 // To execute the fuzzer run
-// bazel run --@rules_rust//rust/toolchain/channel=nightly --build_tag_filters=fuzz_test //rs/embedders/fuzz:execute_with_wasmtime -- corpus/
+// bazel run --config=fuzzing //rs/embedders/fuzz:execute_with_wasmtime -- corpus/
 
 fuzz_target!(|module: ConfiguredModule<ICWasmConfig>| -> Corpus {
     let wasm = module.module.to_bytes();