update rules_mayhem

Author: xansec

.bazelrc

@@ -9,8 +9,8 @@ startup --windows_enable_symlinks
 common:windows --enable_runfiles
 
 # Set default Mayhem URL and config home
-build --action_env=MAYHEM_URL
-build --action_env=XDG_CONFIG_HOME
+common --action_env=MAYHEM_URL
+common --action_env=XDG_CONFIG_HOME
 
 # Spawn strategy (necessary for rules_mayhem)
 build --spawn_strategy=standalone
@@ -24,19 +24,25 @@ common:linux --host_cxxopt=-std=c++17
 # Define the --config=asan-libfuzzer configuration.
 build:asan-libfuzzer --action_env=CC=clang
 build:asan-libfuzzer --action_env=CXX=clang++
+build:asan-libfuzzer --repo_env=CC=clang
+build:asan-libfuzzer --repo_env=CXX=clang++
 build:asan-libfuzzer --@rules_fuzzing//fuzzing:cc_engine=@rules_fuzzing//fuzzing/engines:libfuzzer
 build:asan-libfuzzer --@rules_fuzzing//fuzzing:cc_engine_instrumentation=libfuzzer
 build:asan-libfuzzer --@rules_fuzzing//fuzzing:cc_engine_sanitizer=asan
 
 # Define the --config=libfuzzer configuration.
 build:libfuzzer --action_env=CC=clang
 build:libfuzzer --action_env=CXX=clang++
+build:libfuzzer --repo_env=CC=clang
+build:libfuzzer --repo_env=CXX=clang++
 build:libfuzzer --@rules_fuzzing//fuzzing:cc_engine=@rules_fuzzing//fuzzing/engines:libfuzzer
 build:libfuzzer --@rules_fuzzing//fuzzing:cc_engine_instrumentation=libfuzzer
 
 # Define the --config=uninstrumented configuration.
 build:uninstrumented --action_env=CC=clang
 build:uninstrumented --action_env=CXX=clang++
+build:uninstrumented --repo_env=CC=clang
+build:uninstrumented --repo_env=CXX=clang++
 build:uninstrumented --@rules_fuzzing//fuzzing:cc_engine=@rules_fuzzing//fuzzing/engines:replay
 
 # Set coverage options

.github/workflows/linux.yml

@@ -75,8 +75,7 @@ jobs:
 
       - name: Run Bazel for Mayhem with Docker image
         run: |
-          bazel run --config=libfuzzer //mayhem:push_fuzz_calculator_image
-          bazel build --config=libfuzzer //mayhem:run_fuzz_calculator_image
+          bazel run --config=libfuzzer //mayhem:run_fuzz_calculator_image
         shell: bash
         env:
           MAYHEM_URL: ${{ env.MAYHEM_URL }}
@@ -85,7 +84,7 @@ jobs:
 
       - name: Run bazel for Mayhem package
         run: |
-          bazel build //mayhem:run_test_calculator_package
+          bazel run //mayhem:run_test_calculator_package
         shell: bash
         env:
           MAYHEM_URL: ${{ env.MAYHEM_URL }}

.github/workflows/windows.yml

@@ -68,7 +68,7 @@ jobs:
 
       - name: Run bazel for Mayhem package
         run: |
-          bazel build //mayhem:run_test_calculator_package
+          bazel run //mayhem:run_test_calculator_package
         shell: cmd
         env:
           MAYHEM_URL: ${{ env.MAYHEM_URL }}

MODULE.bazel

@@ -1,14 +1,18 @@
-bazel_dep(name = "googletest", version = "1.15.2")
-bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_fuzzing", version = "0.5.2")
-bazel_dep(name = "rules_mayhem", version = "0.8.3")
-bazel_dep(name = "rules_cc", version = "0.2.0")
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
+bazel_dep(name = "rules_pkg", version = "1.2.0")
+bazel_dep(name = "rules_fuzzing", version = "0.6.0")
+bazel_dep(name = "rules_mayhem", version = "0.8.4")
+bazel_dep(name = "rules_cc", version = "0.2.16")
+
+# Note: This is a temporary workaround to avoid pulling in v2.7.2, as this includes support for
+# the incompatible 'local_config_platform' (see https://github.com/bazelbuild/bazel/issues/22080)
+bazel_dep(name = "aspect_bazel_lib", version = "2.22.5")
 
 rules_mayhem_extension = use_extension("@rules_mayhem//mayhem:extensions.bzl", "rules_mayhem_extension")
 use_repo(rules_mayhem_extension, "bazel_skylib", "mayhem_cli_linux", "mayhem_cli_windows", "platforms", "yq_cli_linux", "yq_cli_windows")
 
 # to-do: fuzztest - see https://github.com/google/fuzztest/issues/950
-bazel_dep(name = "rules_oci", version = "1.8.0")
+bazel_dep(name = "rules_oci", version = "2.2.7")
 
 oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
 
@@ -21,4 +25,4 @@ oci.pull(
 )
 
 # For each oci.pull call, repeat the "name" here to expose them as dependencies.
-use_repo(oci, "ubuntu")
+use_repo(oci, "ubuntu", "ubuntu_linux_amd64")

MODULE.bazel.lock

@@ -51,7 +51,7 @@ bazel build //mayhem:package_calculator
 ## To run calculator target
 
 ```bash
-bazel build //mayhem:run_package_calculator 
+bazel run //mayhem:run_package_calculator 
 ```
 
 The above works with the test target `//test:test_calculator` as well.
@@ -85,15 +85,15 @@ bazel run --config=libfuzzer //mayhem:push_fuzz_calculator_image
 ## To run Mayhem against docker image for libfuzzer target
 
 ```bash
-bazel build --config=libfuzzer //mayhem:run_fuzz_calculator_image
+bazel run --config=libfuzzer //mayhem:run_fuzz_calculator_image
 ```
 
 # Regression Testing
 
 ## To run Mayhem on regression tests only, wait for the run to finish, and output a SARIF report
 
 ```bash
-bazel build --config=libfuzzer //mayhem:run_test_calculator_package
+bazel run --config=libfuzzer //mayhem:run_test_calculator_package
 ```
 
 
@@ -193,7 +193,7 @@ Under the `test` directory, there are a couple of examples of how to integrate G
 You can run this on Mayhem with:
 
 ```bash
-bazel build //mayhem:run_test_calculator_package
+bazel run //mayhem:run_test_calculator_package
 ```
 
 - `harness_utils_test_calculator` is an example inlining harness functionality via a HARNESS macro. The test functions are designed to take a buffer and size, and the HARNESS macro automatically calls the test function with the generated inputs. 

README.md

@@ -1,5 +1,5 @@
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_load")
 load("@rules_mayhem//mayhem:mayhem.bzl", "mayhem_run", "mayhem_package", "mayhem_download")
 
 package(default_visibility = ["//visibility:public"])
@@ -10,6 +10,7 @@ pkg_tar(
     name = "fuzz_calculator_tar",
     srcs = ["//fuzz:fuzz_calculator_bin"],
     mode = "0755",
+    extension = "tar.gz",
     testonly = True,
 )
 
@@ -23,8 +24,8 @@ oci_image(
   workdir = "/",
 )
 
-oci_tarball(
-    name = "fuzz_calculator_tarball",
+oci_load(
+    name = "fuzz_calculator_load",
     image = ":fuzz_calculator_image",
     repo_tags = ["mayhem-bazel-example:latest"],
     testonly = True,
@@ -49,6 +50,8 @@ mayhem_run(
     sanitizer = "true",
     libfuzzer = "false",
     image = "ghcr.io/forallsecure/mayhem-bazel-example:latest",
+    image_dependency = ":push_fuzz_calculator_image",
+    testonly = True,
 )
 
 # Calculator Standalone binary example

harness_utils/fuzzing_utils

@@ -34,6 +34,7 @@ TEST(CalculatorTest, TestAdd) {
 }
 
 FUZZ_TEST(CalculatorTest, FuzzTestAdd) {
+    INIT_FUZZ_TEST
     int x = provider.ConsumeIntegral<int>();
     int y = provider.ConsumeIntegral<int>();
     test_add(x, y);
@@ -44,6 +45,7 @@ TEST(CalculatorTest, TestSubtract) {
 }
 
 FUZZ_TEST(CalculatorTest, FuzzTestSubtract) {
+    INIT_FUZZ_TEST
     int x = provider.ConsumeIntegral<int>();
     int y = provider.ConsumeIntegral<int>();
     test_subtract(x, y);
@@ -54,6 +56,7 @@ TEST(CalculatorTest, TestMultiply) {
 }
 
 FUZZ_TEST(CalculatorTest, FuzzTestMultiply) {
+    INIT_FUZZ_TEST
     int x = provider.ConsumeIntegral<int>();
     int y = provider.ConsumeIntegral<int>();
     test_multiply(x, y);
@@ -64,6 +67,7 @@ TEST(CalculatorTest, TestDivide) {
 }
 
 FUZZ_TEST(CalculatorTest, FuzzTestDivide) {
+    INIT_FUZZ_TEST
     int x = provider.ConsumeIntegral<int>();
     int y = provider.ConsumeIntegral<int>();
     if (y == 0) {
@@ -77,6 +81,7 @@ TEST(CalculatorTest, TestFactorGame) {
 }
 
 FUZZ_TEST(CalculatorTest, FuzzTestFactorGame) {
+    INIT_FUZZ_TEST
     int x = provider.ConsumeIntegral<int>();
     int y = provider.ConsumeIntegral<int>();
     test_factor_game(x, y);