@automattic/yara 2.3.0 → 2.4.0

package/.github/workflows/tests.yml

@@ -10,26 +10,44 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
         node-version:
-        - '14.x'
-        - '16.x'
+        - '14'
+        - '16'
+        - '18'
+        os:
+        - 'ubuntu'
+        - 'macos'
+
+    runs-on: ${{ matrix.os }}-latest
 
     steps:
     - uses: actions/checkout@v2
+
+    - name: Setup MacOs
+      if: matrix.os == 'macos'
+      run: brew install autoconf automake libmagic
+
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@master
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: Install dependencies
+    - name: Build binaries with node-pre-gyp
       run: |
-        sudo apt-get install libyara-dev
-        npm install
+        set -x
+        npm install --build-from-source
+
+        ls -lh ./build/Release
+        md5sum ./build/Release/yara.node || md5 ./build/Release/yara.node || true
+
+    - name: Upload binaries as Action run artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: node${{ matrix.node-version }}-${{ matrix.os }}-yara.node
+        path: ./build/Release/yara.node
 
-#     - name: Run tests
-#       run: npm test
+    - name: Run tests
+      run: npm test

package/Makefile

@@ -0,0 +1,34 @@
+
+BASE=$(shell pwd)
+OSNAME=$(shell uname)
+
+CFGOPTS += --with-crypto
+CFGOPTS += --enable-magic
+
+ifeq ($(OSNAME),Darwin)
+CFLAGS  += -I/usr/local/include/node
+CFLAGS  += -I/usr/local/include
+LDFLAGS += -L/usr/local/lib
+endif
+
+YARA?=4.2.3
+
+libyara: yara
+
+yara:
+	-rm -rf $(BASE)/build/yara
+	-rm -rf $(BASE)/deps/yara-$(YARA)
+	test -f $(BASE)/deps/yara-$(YARA).tar.gz || curl -L -k https://github.com/VirusTotal/yara/archive/v$(YARA).tar.gz > $(BASE)/deps/yara-$(YARA).tar.gz
+	cd $(BASE)/deps && tar -xzvf yara-$(YARA).tar.gz
+	cd $(BASE)/deps/yara-$(YARA) && ./bootstrap.sh
+	cd $(BASE)/deps/yara-$(YARA) && \
+			CFLAGS="$(CFLAGS)" \
+			LDFLAGS="$(LDFLAGS)" \
+			./configure \
+					$(CFGOPTS) \
+					--enable-static \
+					--disable-shared \
+					--with-pic \
+					--prefix=$(BASE)/build/yara
+	cd $(BASE)/deps/yara-$(YARA) && make
+	cd $(BASE)/deps/yara-$(YARA) && make install

package/README.md

@@ -5,7 +5,7 @@ This module implements [YARA][yara] bindings for [Node.js][nodejs].
 
 **This module is supported on Linux and MacOS (using homebrew) platforms only**
 
-This module uses the installed version of libyara.  You should download,
+This module uses the installed version of libyara 3.9. You should download,
 compile and install your preferred version, or use one of the following
 commands using your system package manager:
 
@@ -24,7 +24,7 @@ This module is installed using [node package manager (npm)][npm]:
 	# during installation using node-gyp.  A suitable build chain
 	# must be configured before installation.
 
-	npm install @automattic/yara
+	npm i --save "yara@npm:@automattic/yara@latest"
 
 It is loaded using the `require()` function:
 

package/binding.gyp

@@ -10,10 +10,12 @@
         "-fno-rtti"
       ],
       "include_dirs": [
-        "<!(node -e 'require(\"nan\")')"
+        "<!(node -e 'require(\"nan\")')",
+        "./build/yara/include"
       ],
       "libraries": [
-        "-lyara"
+        "-lmagic",
+        "../build/yara/lib/libyara.a"
       ],
       "conditions": [
         [
@@ -24,6 +26,21 @@
             }
           }
         ]
+      ],
+      "actions": [
+        {
+          "action_name": "build_libyara",
+          "inputs": [
+            "deps"
+          ],
+          "outputs": [
+            "build/yara"
+          ],
+          "action": [
+            "make",
+            "libyara"
+          ]
+        }
       ]
     }
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/yara",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Automattic's fork of YARA support for Node.js",
   "main": "index.js",
   "directories": {
@@ -10,6 +10,9 @@
     "nan": "2.14.*",
     "typescript": "^3.8.3"
   },
+  "scripts": {
+    "test": "mocha test/*"
+  },
   "contributors": [
     {
       "name": "Stephen Vickers",
@@ -31,5 +34,8 @@
     "yara"
   ],
   "author": "NoSpaceships Ltd <hello@nospaceships.com>",
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "mocha": "^10.0.0"
+  }
 }

package/src/yara.cc

@@ -7,6 +7,7 @@
 #include <string>
 #include <sstream>
 #include <mutex>
+#include <iostream>
 
 #include <errno.h>
 #include <stdio.h>
@@ -42,9 +43,9 @@ enum VarType {
 #define ERROR_UNKNOWN_STRING "ERROR_UNKNOWN"
 
 void compileCallback(int error_level, const char* file_name, int line_number,
-		const char* message, void* user_data);
+		const YR_RULE* rule, const char* message, void* user_data);
 
-int scanCallback(int message, void* data, void* param);
+int scanCallback(YR_SCAN_CONTEXT* scan_context, int message, void* data, void* param);
 
 const char* getErrorString(int code) {
 	size_t count = error_codes.count(code);
@@ -515,11 +516,15 @@ private:
 };
 
 void compileCallback(int error_level, const char* file_name, int line_number,
-		const char* message, void* user_data) {
+		const YR_RULE* rule, const char* message, void* user_data) {
 	CompileArgs* args = (CompileArgs*) user_data;
 
 	std::ostringstream oss;
-	oss << args->rule_config->index << ":" << line_number << ":" << message << ":" << file_name;
+	oss << args->rule_config->index << ":" << line_number << ":" << message << ":";
+
+	if (file_name != NULL) {
+		oss << file_name;
+	}
 
 	if (error_level == YARA_ERROR_LEVEL_WARNING)
 		args->configure->warnings.push_back(oss.str());
@@ -860,7 +865,7 @@ private:
 	ScanReq* scan_req_;
 };
 
-int scanCallback(int message, void* data, void* param) {
+int scanCallback(YR_SCAN_CONTEXT* scan_context, int message, void* data, void* param) {
 	AsyncScan* async_scan = (AsyncScan*) param;
 
 	YR_RULE* rule;
@@ -896,7 +901,7 @@ int scanCallback(int message, void* data, void* param) {
 			}
 
 			yr_rule_strings_foreach(rule, string) {
-				yr_string_matches_foreach(string, match) {
+				yr_string_matches_foreach(scan_context, string, match) {
 					std::ostringstream oss;
 					oss << match->offset << ":" << match->match_length << ":" << string->identifier;
 
@@ -944,6 +949,8 @@ int scanCallback(int message, void* data, void* param) {
 NAN_METHOD(ScannerWrap::ReconfigureVariables) {
 	Nan::HandleScope scope;
 
+
+
 	ScannerWrap* scanner = ScannerWrap::Unwrap<ScannerWrap>(info.This());
 
 	std::lock_guard<std::mutex> lock(scanner->mutex);
@@ -1152,7 +1159,7 @@ NAN_METHOD(ScannerWrap::Scan) {
 
 	Local<Object> req = Nan::To<Object>(info[0]).ToLocalChecked();
 
-	char* filename = NULL;
+	std::string filename;
 	char *buffer = NULL;
 	int64_t offset = 0;
 	int64_t length = 0;
@@ -1160,8 +1167,10 @@ NAN_METHOD(ScannerWrap::Scan) {
 	int32_t timeout = 0;
 	int32_t matched_bytes = 0;
 
+
 	if (Nan::Get(req, Nan::New("filename").ToLocalChecked()).ToLocalChecked()->IsString()) {
 		Local<String> s = Nan::To<String>(Nan::Get(req, Nan::New("filename").ToLocalChecked()).ToLocalChecked()).ToLocalChecked();
+
 		filename = *Nan::Utf8String(s);
 	} else if (Nan::Get(req, Nan::New("buffer").ToLocalChecked()).ToLocalChecked()->IsObject()) {
 		Local<Object> o = Nan::To<Object>(Nan::Get(req, Nan::New("buffer").ToLocalChecked()).ToLocalChecked()).ToLocalChecked();
@@ -1226,7 +1235,7 @@ NAN_METHOD(ScannerWrap::Scan) {
 		}
 	}
 
-	if ((! filename) && (! buffer)) {
+	if ((filename.empty()) && (! buffer)) {
 		Nan::ThrowError("Either filename of buffer is required");
 		return;
 	}
@@ -1246,8 +1255,9 @@ NAN_METHOD(ScannerWrap::Scan) {
 
 	ScanReq* scan_req = new ScanReq();
 
-	if (filename)
-		scan_req->filename = filename;
+	if (!filename.empty()) {
+		scan_req->filename = filename.c_str();
+	}		
 
 	scan_req->buffer = buffer;
 	scan_req->offset = offset;
@@ -1268,6 +1278,7 @@ NAN_METHOD(ScannerWrap::Scan) {
 	Nan::AsyncQueueWorker(async_scan);
 
 	info.GetReturnValue().Set(info.This());
+
 }
 
 }; /* namespace yara */

package/test/unit_index.js_scanner.configure.js

@@ -54,7 +54,7 @@ describe("index.js", function() {
 					var expErrors = [{
 						index: 0,
 						line: 1,
-						message: "syntax error, unexpected '}', expecting <condition>"
+						message: "syntax error"
 					}]
 
 					assert.deepEqual(error.errors, expErrors)
@@ -78,7 +78,7 @@ describe("index.js", function() {
 					var expErrors = [{
 						index: 0,
 						line: 1,
-						message: "syntax error, unexpected '}', expecting <condition>"
+						message: "syntax error"
 					}]
 
 					assert.deepEqual(error.errors, expErrors)
@@ -114,7 +114,7 @@ describe("index.js", function() {
 						{
 							index: 0,
 							line: 4,
-							message: 'Using literal string "stephen" in a boolean operation.'
+							message: 'using literal string "stephen" in a boolean operation.'
 						}
 					]
 
@@ -160,7 +160,7 @@ describe("index.js", function() {
 					var expErrors = [{
 						index: 0,
 						line: 4,
-						message: "syntax error, unexpected hex string, expecting identifier"
+						message: "syntax error"
 					}]
 
 					assert.deepEqual(error.errors, expErrors)