net-snmp 3.18.1 → 3.19.0

package/README.md

@@ -3457,6 +3457,14 @@ Example programs are included under the module's `example` directory.
 
  * Add agent option key for MIB options
 
+## Version 3.18.2 - 06/01/2025
+
+ * Add conversion of scalar defVal enumeration name to number on assignment
+
+## Version 3.19.0 - 06/02/2025
+
+ * Remove deprecated isArray call and fix agent string constraints check
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -682,7 +682,7 @@ ObjectTypeUtil.isValid = function (type, value, constraints) {
 			if ( typeof value != "string" && ! (value instanceof Buffer) ) {
 				return false;
 			}
-			if ( constraints && ObjectTypeUtil.doesStringMeetConstraints (value, constraints) ) {
+			if ( constraints && ! ObjectTypeUtil.doesStringMeetConstraints (value, constraints) ) {
 				return false;
 			}
 			return true;
@@ -783,6 +783,15 @@ ObjectTypeUtil.doesStringMeetConstraints = function (value, constraints) {
 	return true;
 };
 
+ObjectTypeUtil.getEnumerationNumberFromName = function (enumeration, name) {
+	for ( const [enumNumber, enumName] of Object.entries (enumeration) ) {
+		if ( enumName === name ) {
+			return Number (enumNumber);
+		}
+	}
+	return null;
+};
+
 /*****************************************************************************
  ** PDU class definitions
  **/
@@ -4199,10 +4208,15 @@ Mib.prototype.populateIndexEntryFromColumn = function (localProvider, indexEntry
 Mib.prototype.registerProvider = function (provider) {
 	this.providers[provider.name] = provider;
 	if ( provider.type == MibProviderType.Scalar ) {
-		if ( this.options?.addScalarDefaultsOnRegistration ) {
-			if ( provider.defVal ) {
-				this.setScalarValue (provider.name, provider.defVal);
+		if ( this.options?.addScalarDefaultsOnRegistration && provider.defVal ) {
+			let scalarValue;
+			// If the scalar has an enumeration, set the value to the enumeration number derived from the defVal name
+			if ( provider.constraints?.enumeration ) {
+				scalarValue = ObjectTypeUtil.getEnumerationNumberFromName (provider.constraints.enumeration, provider.defVal);
+			} else {
+				scalarValue = provider.defVal;
 			}
+			this.setScalarValue (provider.name, scalarValue);
 		}
 	} else if ( provider.type == MibProviderType.Table ) {
 		if ( provider.tableAugments ) {
@@ -4709,7 +4723,7 @@ Mib.convertOidToAddress = function (oid) {
 	var oidArray;
 	var i;
 
-	if (typeof (oid) === 'object' && util.isArray(oid)) {
+	if (typeof (oid) === 'object' && Array.isArray(oid)) {
 		address = oid;
 	} else if (typeof (oid) === 'string') {
 		address = oid.split('.');

package/package.json

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

package/test/object-types.test.js

@@ -85,6 +85,22 @@ describe('Object Types', function() {
 				assert.equal(snmp.ObjectTypeUtil.isValid(snmp.ObjectType.OctetString, Buffer.from('1.3.6.1.2.3.4.5')), true);
 			});
 		});
+		describe('A string with a length of 6 is valid for a size range of 2 - 7', function() {
+			it('returns true', function() {
+				const sizes = [
+					{ min: 2, max: 7 },
+				];
+				assert.equal(snmp.ObjectTypeUtil.isValid(snmp.ObjectType.OctetString, 'sixlet', { sizes }), true);
+			});
+		});
+		describe('A string with a length of 6 is not valid for a size range of 2 - 5', function() {
+			it('returns true', function() {
+				const sizes = [
+					{ min: 2, max: 5 },
+				];
+				assert.equal(snmp.ObjectTypeUtil.isValid(snmp.ObjectType.OctetString, 'sixlet', { sizes }), false);
+			});
+		});
 	});
 
 	describe('isValid() - OID', function() {