Merge pull request #493 from AikidoSec/fix-mysql2-hooks

Fix mysql2 hooks
AikidoSec · Jan 3, 2025 · d8c8ed1 · d8c8ed1
2 parents ef592e3 + 3e05fd1
commit d8c8ed1
Show file tree

Hide file tree

Showing 11 changed files with 326 additions and 146 deletions.
diff --git a/library/helpers/satisfiesVersion.test.ts b/library/helpers/satisfiesVersion.test.ts
@@ -36,6 +36,8 @@ t.test("it matches single range", async () => {
   t.equal(satisfiesVersion("^1.0.0", "0.0.0"), false);
   t.equal(satisfiesVersion("^1.0.0", "2.0.0"), false);
   t.equal(satisfiesVersion("^2.0.0", "1.0.0"), false);
+  t.equal(satisfiesVersion("^1.2.1", "1.3.0"), true);
+  t.equal(satisfiesVersion("^1.2.1", "1.2.0"), false);
 });
 
 t.test("it matches multiple ranges", async () => {

diff --git a/library/helpers/satisfiesVersion.ts b/library/helpers/satisfiesVersion.ts
@@ -49,9 +49,19 @@ export function satisfiesVersion(range: string, version: string) {
       .split(".")
       .map((p) => parseInt(p, 10));
 
-    if (major === rMajor && minor >= rMinor && patch >= rPatch) {
-      return true;
+    if (major !== rMajor) {
+      continue;
+    }
+
+    if (minor < rMinor) {
+      continue;
     }
+
+    if (minor === rMinor && patch < rPatch) {
+      continue;
+    }
+
+    return true;
   }
 
   return false;

diff --git a/library/package-lock.json b/library/package-lock.json
diff --git a/library/package.json b/library/package.json
@@ -97,7 +97,8 @@
     "mongodb-v5": "npm:mongodb@^5.0.0",
     "mongodb-v6": "npm:mongodb@^6.0.0",
     "mysql": "^2.18.1",
-    "mysql2": "^3.10.0",
+    "mysql2-v3.10": "npm:[email protected]",
+    "mysql2-v3.12": "npm:[email protected]",
     "needle": "^3.3.1",
     "node-fetch": "^2",
     "percentile": "^1.6.0",

diff --git a/library/sinks/MySQL2.test.ts b/library/sinks/MySQL2.test.ts