afl: use unified fuzzer mode FIXUP

Author: oetr

packages/core/core.ts

@@ -44,12 +44,7 @@ import {
 	reportFinding,
 } from "./finding";
 import { getJazzerJsGlobal, jazzerJs } from "./globals";
-import {
-	buildLibAflOptions,
-	buildLibFuzzerOptions,
-	OptionsManager,
-	resolveEngine,
-} from "./options";
+import { buildLibAflOptions, buildLibFuzzerOptions } from "./options";
 import { ensureFilepath, importModule } from "./utils";
 
 // Remove temporary files on exit

packages/core/options.test.ts

@@ -18,7 +18,7 @@ import fs from "fs";
 import os from "os";
 import path from "path";
 
-import { OptionsManager, OptionSource } from "@jazzer.js/options";
+import { Mode, OptionsManager, OptionSource } from "@jazzer.js/options";
 
 import { buildLibAflOptions, spawnsSubprocess } from "./options";
 
@@ -57,7 +57,7 @@ describe("libafl options", () => {
 		);
 
 		expect(buildLibAflOptions(manager)).toEqual({
-			mode: "fuzzing",
+			mode: Mode.Fuzzing,
 			runs: 99,
 			seed: 1337,
 			maxLen: 1024,
@@ -85,14 +85,14 @@ describe("libafl options", () => {
 		const manager = new OptionsManager(OptionSource.DefaultCLIOptions).merge(
 			{
 				engine: "libafl",
-				mode: "regression",
+				mode: Mode.Regression,
 				fuzzerOptions: ["corpus", "-runs=1"],
 			},
 			OptionSource.CommandLineArguments,
 		);
 
 		expect(buildLibAflOptions(manager)).toEqual({
-			mode: "regression",
+			mode: Mode.Regression,
 			runs: 0,
 			seed: 0,
 			maxLen: 4096,

packages/fuzzer/libafl_runtime.test.ts

@@ -19,11 +19,13 @@ import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
 
+import { Mode } from "@jazzer.js/options";
+
 import { addon } from "./addon";
 import { fuzzer } from "./fuzzer";
 
 const libAflOptions = {
-	mode: "fuzzing" as const,
+	mode: Mode.Fuzzing,
 	runs: 32,
 	seed: 1234,
 	maxLen: 64,
@@ -308,7 +310,7 @@ describe("LibAFL runtime", () => {
 				fuzzer.tracer.tracePcIndir(13, data.length);
 			},
 			{
-				mode: "fuzzing",
+				mode: Mode.Fuzzing,
 				runs: 1,
 				seed: 9,
 				maxLen: 16,

packages/fuzzer/runtime/benchmark.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+const { Mode } = require("../../options/dist/index.js");
 const { addon } = require("../dist/addon.js");
 const { fuzzer } = require("../dist/fuzzer.js");
 
@@ -28,7 +29,7 @@ const libFuzzerArgs = [
 	`-max_len=${maxLen}`,
 ];
 const libAflOptions = {
-	mode: "fuzzing",
+	mode: Mode.Fuzzing,
 	runs,
 	seed,
 	maxLen,

packages/options/index.ts

@@ -23,7 +23,7 @@ export const Mode = {
 export type Mode = (typeof Mode)[keyof typeof Mode];
 
 export type LibAflOptions = {
-	mode: "fuzzing" | "regression";
+	mode: Mode;
 	runs: number;
 	seed: number;
 	maxLen: number;