Fix wasm-opt, allow pkg name rewrite

Author: timokoessler

instrumentation-wasm/Cargo.lock

@@ -10,13 +10,13 @@ name = "node_code_instrumentation"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-oxc_allocator = "0.68.1"
-oxc_ast = "0.68.1"
-oxc_codegen = "0.68.1"
-oxc_parser = "0.68.1"
-oxc_semantic = "0.68.1"
-oxc_span = "0.68.1"
-oxc_traverse = "0.68.1"
+oxc_allocator = "0.72.0"
+oxc_ast = "0.72.0"
+oxc_codegen = "0.72.0"
+oxc_parser = "0.72.0"
+oxc_semantic = "0.72.0"
+oxc_span = "0.72.0"
+oxc_traverse = "0.72.0"
 serde = "1.0.219"
 serde_json = "1.0.140"
 wasm-bindgen = "0.2.100"
@@ -25,3 +25,6 @@ wasm-bindgen = "0.2.100"
 strip = true
 opt-level = "s"
 lto = true
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = ["-O", "--enable-bulk-memory"]

instrumentation-wasm/Cargo.toml

@@ -287,10 +287,7 @@ t.test("typescript code in a js file", async (t) => {
     t.ok(error instanceof Error);
     if (error instanceof Error) {
       t.match(error.message, "Error transforming code: #ERR:");
-      t.match(
-        error.message,
-        "Expected a semicolon or an implicit semicolon after a statement, but found none"
-      );
+      t.match(error.message, 'Expected `;` but found `:`"');
     }
   }
 });

library/agent/hooks/instrumentation/codeTransformation.test.ts

@@ -3,6 +3,7 @@ import type { PackageFileInstrumentationInstructionJSON } from "./types";
 import { wasm_transform_code_str } from "./wasm/node_code_instrumentation";
 import { getSourceType, PackageLoadFormat } from "./getSourceType";
 import { envToBool } from "../../../helpers/envToBool";
+import { join } from "path";
 
 export function transformCode(
   pkgName: string,
@@ -28,7 +29,7 @@ export function transformCode(
   if (envToBool(process.env.AIKIDO_TEST_NEW_INSTRUMENTATION)) {
     return result.replace(
       "@aikidosec/firewall/instrument/internals",
-      "../../../../agent/hooks/instrumentation/injectedFunctions.ts"
+      join(__dirname, "injectedFunctions.ts")
     );
   }
 

library/agent/hooks/instrumentation/codeTransformation.ts

@@ -17,12 +17,22 @@ let builtinRequireInterceptors = new Map<string, RequireInterceptor[]>();
 // Identifier for the function is: packageName.relativePath.functionName.nodeType.matchingVersion
 let packageCallbackInfo = new Map<string, IntereptorCallbackInfoObj>();
 
+// In order to support multiple versions of the same package in unit tests, we need to rewrite the package name
+// e.g. In our sources and sinks, we use the real package name `hooks.addPackage("undici")`
+// but in the tests we want to `require("undici-v6")` instead of `require("undici")`
+let __packageNamesToRewrite: Record<string, string> = {};
+
 export function setPackagesToInstrument(_packages: Package[]) {
   // Clear the previous packages
   packages = new Map();
   packageCallbackInfo = new Map();
 
   for (const pkg of _packages) {
+    if (pkg.getName() in __packageNamesToRewrite) {
+      // If the package name is in the rewrite map, we use the rewritten name
+      pkg.setName(__packageNamesToRewrite[pkg.getName()]);
+    }
+
     const packageInstructions = pkg
       .getVersions()
       .map((versionedPackage) => {
@@ -125,3 +135,9 @@ export function getBuiltinInterceptors(name: string): RequireInterceptor[] {
 export function shouldPatchBuiltin(name: string): boolean {
   return builtinRequireInterceptors.has(name);
 }
+
+export function __internalRewritePackageNamesForTesting(
+  rewrite: Record<string, string>
+) {
+  __packageNamesToRewrite = rewrite;
+}