net-snmp 3.16.0 → 3.17.0

package/README.md

@@ -3432,6 +3432,14 @@ Example programs are included under the module's `example` directory.
 
  * Add MIB object validation to set/add MIB API calls
 
+## Version 3.16.1 - 01/01/2025
+
+ * Fix loading of MIB directory paths with periods
+
+## Version 3.17.0 - 01/01/2025
+
+ * Relax validation of unknown object types
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/example/mib-parser.js

@@ -8,7 +8,7 @@ var providers;
 var mibDir = '/var/tmp/mibs/';
 
 var counter64 = function (num) {
-    var buf = Buffer.alloc (4);
+    var buf = Buffer.alloc (8);
     buf.writeUInt32BE (num);
     return buf;
 };

package/index.js

@@ -641,7 +641,8 @@ ObjectTypeUtil.isValid = function (type, value) {
 		case ObjectType.Boolean: {
 			return typeof value == "boolean";
 		}
-		case ObjectType.Integer: {
+		case ObjectType.Integer:
+		case ObjectType.Integer32: {
 			// Allow strings that can be parsed as integers
 			const parsed = Number(value);
 			return ! isNaN (parsed) && Number.isInteger (parsed) && parsed >= MIN_SIGNED_INT32 && parsed <= MAX_SIGNED_INT32;
@@ -653,15 +654,24 @@ ObjectTypeUtil.isValid = function (type, value) {
 		case ObjectType.OID: {
 			return typeof value == "string" && value.match (/^([0-9]+)(\.[0-9]+)+$/);
 		}
-		case ObjectType.Counter: {
+		case ObjectType.Counter:
+		case ObjectType.Counter32:
+		case ObjectType.Gauge:
+		case ObjectType.Gauge32:
+		case ObjectType.Unsigned32: {
 			// Allow strings that can be parsed as integers
 			const parsed = Number(value);
 			return ! isNaN (parsed) && Number.isInteger (parsed) && parsed >= 0 && parsed <= MAX_UNSIGNED_INT32;
 		}
 		case ObjectType.Counter64: {
-			// Allow strings that can be parsed as integers
-			const parsed = Number(value);
-			return ! isNaN (parsed) && Number.isInteger (parsed) && parsed >= 0;
+			if ( value instanceof Buffer ) {
+				// Allow buffers of 8 bytes - should do further check to see if it translates to a valid integer
+				return value.length == 8;
+			} else {
+				// Allow strings that can be parsed as integers
+				const parsed = Number(value);
+				return ! isNaN (parsed) && Number.isInteger (parsed) && parsed >= 0;
+			}
 		}
 		case ObjectType.IpAddress: {
 			const octets = value.split(".");
@@ -678,8 +688,9 @@ ObjectTypeUtil.isValid = function (type, value) {
 			}
 			return true;
 		}
+		// return true for all other types until we are certain all object types are covered with specific rules
 		default: {
-			return false;
+			return true;
 		}
 	}
 

package/lib/mib.js

@@ -1,6 +1,7 @@
-var fs = require('fs');
+const fs = require('fs');
+const path = require('path');
 
-var MIB = function (dir) {
+const MIB = function (dir) {
 
     var initializeBuffer = function (buffer) {
         return Object.assign(buffer, {
@@ -127,7 +128,7 @@ var MIB = function (dir) {
             }
         },
         Import: function (FileName) {
-            this.ParseModule(FileName.split('/')[FileName.split('/').length - 1].split('.')[0], fs.readFileSync(FileName).toString());
+            this.ParseModule(path.basename(FileName, path.extname(FileName)), fs.readFileSync(FileName).toString());
         },
         ParseModule: function (FileName, Contents) {
             initializeBuffer(this.CharBuffer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "net-snmp",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "description": "JavaScript implementation of the Simple Network Management Protocol (SNMP)",
   "main": "index.js",
   "directories": {