Przeglądaj źródła

More speedrun stats (literally 10x faster)

Matt 6 lat temu
rodzic
commit
8bba4b2973
3 zmienionych plików z 16 dodań i 11 usunięć
  1. 3 3
      package-lock.json
  2. 1 1
      package.json
  3. 12 7
      src/core/operations/YARARules.mjs

+ 3 - 3
package-lock.json

@@ -7756,9 +7756,9 @@
       "integrity": "sha1-ZMTwJfF/1Tv7RXY/rrFvAVp0dVA="
     },
     "libyara-wasm": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/libyara-wasm/-/libyara-wasm-0.0.8.tgz",
-      "integrity": "sha512-ZB+Ya3bEBoanvde47X8RzqpMBHgrPxrTZIJ/UEoatVnOEy2he1IORuotdSkP2o73URRzHGN1jNWDIhTdfbZ3rQ=="
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/libyara-wasm/-/libyara-wasm-0.0.9.tgz",
+      "integrity": "sha512-GTR8GD7q2xCwRzQpoSVh31KPbH145tCKaU3DAnQMpkf4aKqjnVpQlq6gUjyDhvw8RPZ2tamyQad5hg42KsVvRw=="
     },
     "livereload-js": {
       "version": "2.4.0",

+ 1 - 1
package.json

@@ -106,7 +106,7 @@
     "jsqr": "^1.1.1",
     "jsrsasign": "8.0.12",
     "kbpgp": "^2.0.82",
-    "libyara-wasm": "0.0.8",
+    "libyara-wasm": "0.0.9",
     "lodash": "^4.17.11",
     "loglevel": "^1.6.1",
     "loglevel-message-prefix": "^3.0.0",

+ 12 - 7
src/core/operations/YARARules.mjs

@@ -59,16 +59,22 @@ class YARARules extends Operation {
      * @returns {string}
      */
     run(input, args) {
+        if (ENVIRONMENT_IS_WORKER())
+            self.sendStatusMessage("Instantiating YARA.");
         const [rules, showStrings, showLengths, showMeta] = args;
         return new Promise((resolve, reject) => {
             Yara().then(yara => {
+                if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Converting data for YARA.");
                 let matchString = "";
-                const inpArr = new Uint8Array(input);
-                const inpVec = new yara.vectorChar();
-                for (let i = 0; i < inpArr.length; i++) {
-                    inpVec.push_back(inpArr[i]);
-                }
-                const resp = yara.run(inpVec, rules);
+
+                const inpArr = new Uint8Array(input); // Turns out embind knows that JS uint8array <==> C++ std::string
+
+                if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Running YARA matching.");
+
+                const resp = yara.run(inpArr, rules);
+
+                if (ENVIRONMENT_IS_WORKER()) self.sendStatusMessage("Processing data.");
+
                 if (resp.compileErrors.size() > 0) {
                     for (let i = 0; i < resp.compileErrors.size(); i++) {
                         const compileError = resp.compileErrors.get(i);
@@ -102,7 +108,6 @@ class YARARules extends Operation {
                             }
                         }
                     }
-                    
                 }
                 resolve(matchString);
             });