net-snmp 3.5.5 → 3.6.0

package/README.md

@@ -3154,6 +3154,22 @@ Example programs are included under the module's `example` directory.
 
  * Add missing return in getbulk feedCb callback non-repeaters error condition
 
+## Version 3.5.6 - 20/10/2021
+
+ * Fix GetNext OID calculation for off-tree OIDs
+
+## Version 3.5.7 - 20/11/2021
+
+ * Fix handing of null varbinds in walk
+
+## Version 3.5.8 - 24/11/2021
+
+ * Fix processing of negative integers larger than 32 bits
+
+## Version 3.6.0 - 18/02/2022
+
+ * Add calculated key cache to remove authNoPriv and authPriv performance bottleneck
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/index.js

@@ -428,13 +428,15 @@ function readUint (buffer, isSigned) {
 		value += buffer.readByte ();
 
 		if (isSigned && i <= 0) {
-			if ((value & 0x80) == 0x80)
+			if ((value & 0x80) == 0x80) {
 				signedBitSet = true;
+			}
 		}
 	}
 	
-	if (signedBitSet)
-		value -= (1 << (i * 8));
+	if (signedBitSet) {
+		value -= 2 ** (i * 8);
+	}
 
 	return value;
 }
@@ -932,17 +934,32 @@ Authentication.algorithms[AuthProtocols.sha] = {
 	CRYPTO_ALGORITHM: 'sha1'
 };
 
+Authentication.authToKeyCache = {};
+
+Authentication.computeCacheKey = function (authProtocol, authPasswordString, engineID) {
+	var engineIDString = engineID.toString('base64');
+	return authProtocol + authPasswordString + engineIDString;
+};
+
 // Adapted from RFC3414 Appendix A.2.1. Password to Key Sample Code for MD5
 Authentication.passwordToKey = function (authProtocol, authPasswordString, engineID) {
 	var hashAlgorithm;
 	var firstDigest;
 	var finalDigest;
-	var buf = Buffer.alloc (Authentication.HMAC_BUFFER_SIZE);
+	var buf;
 	var bufOffset = 0;
 	var passwordIndex = 0;
 	var count = 0;
-	var password = Buffer.from (authPasswordString);
+	var password;
 	var cryptoAlgorithm = Authentication.algorithms[authProtocol].CRYPTO_ALGORITHM;
+
+	var cacheKey = Authentication.computeCacheKey(authProtocol, authPasswordString, engineID);
+	if (Authentication.authToKeyCache[cacheKey] !== undefined) {
+		return Authentication.authToKeyCache[cacheKey];
+	}
+
+	buf = Buffer.alloc (Authentication.HMAC_BUFFER_SIZE);
+	password = Buffer.from (authPasswordString);
 	
 	while (count < Authentication.HMAC_BUFFER_SIZE) {
 		for (var i = 0; i < Authentication.HMAC_BLOCK_SIZE; i++) {
@@ -962,6 +979,7 @@ Authentication.passwordToKey = function (authProtocol, authPasswordString, engin
 	finalDigest = hashAlgorithm.digest();
 	// debug ("Localized key: " + finalDigest.toString('hex'));
 
+	Authentication.authToKeyCache[cacheKey] = finalDigest;
 	return finalDigest;
 };
 
@@ -2642,7 +2660,7 @@ function walkCb (req, error, varbinds) {
 		}
 	}
 
-	if ( ! varbinds.length ) {
+	if ( ! varbinds || ! varbinds.length ) {
 		req.doneCb(null);
 		return;
 	}
@@ -3492,7 +3510,7 @@ MibNode.prototype.findChildImmediatelyBefore = function (index) {
 			}
 		}
 	}
-	return this.children[sortedChildrenKeys[sortedChildrenKeys.length]];
+	return this.children[sortedChildrenKeys[sortedChildrenKeys.length - 1]];
 };
 
 MibNode.prototype.isDescendant = function (address) {
@@ -3544,11 +3562,11 @@ MibNode.prototype.getConstraintsFromProvider = function () {
 };
 
 MibNode.prototype.setValue = function (newValue) {
-    var len;
-    var min;
-    var max;
-    var range;
-    var found = false;
+	var len;
+	var min;
+	var max;
+	var range;
+	var found = false;
 	var constraints = this.getConstraintsFromProvider ();
 	if ( ! constraints ) {
 		this.value = newValue;
@@ -3559,35 +3577,35 @@ MibNode.prototype.setValue = function (newValue) {
 			return false;
 		}
 	} else if ( constraints.ranges ) {
-        for ( range of constraints.ranges ) {
-            min = "min" in range ? range.min : Number.MIN_SAFE_INTEGER;
-            max = "max" in range ? range.max : Number.MAX_SAFE_INTEGER;
-            if ( newValue >= min && newValue <= max ) {
-                found = true;
-                break;
-            }
-        }
-        if ( ! found ) {
-            return false;
-        }
-    } else if ( constraints.sizes ) {
-        // if size is constrained, value must have a length property
-        if ( ! ( "length" in newValue ) ) {
-            return false;
-        }
-        len = newValue.length;
-        for ( range of constraints.sizes ) {
-            min = "min" in range ? range.min : Number.MIN_SAFE_INTEGER;
-            max = "max" in range ? range.max : Number.MAX_SAFE_INTEGER;
-            if ( len >= min && len <= max ) {
-                found = true;
-                break;
-            }
-        }
-        if ( ! found ) {
-            return false;
-        }
-    }
+		for ( range of constraints.ranges ) {
+			min = "min" in range ? range.min : Number.MIN_SAFE_INTEGER;
+			max = "max" in range ? range.max : Number.MAX_SAFE_INTEGER;
+			if ( newValue >= min && newValue <= max ) {
+				found = true;
+				break;
+			}
+		}
+		if ( ! found ) {
+			return false;
+		}
+	} else if ( constraints.sizes ) {
+		// if size is constrained, value must have a length property
+		if ( ! ( "length" in newValue ) ) {
+			return false;
+		}
+		len = newValue.length;
+		for ( range of constraints.sizes ) {
+			min = "min" in range ? range.min : Number.MIN_SAFE_INTEGER;
+			max = "max" in range ? range.max : Number.MAX_SAFE_INTEGER;
+			if ( len >= min && len <= max ) {
+				found = true;
+				break;
+			}
+		}
+		if ( ! found ) {
+			return false;
+		}
+	}
 	this.value = newValue;
 	return true;
 };
@@ -3824,7 +3842,16 @@ Mib.prototype.getTreeNode = function (oid) {
 		var last = address.pop ();
 		var parent = this.lookupAddress (address);
 		if ( parent ) {
-			return (parent.findChildImmediatelyBefore (last) || parent);
+			node = parent.findChildImmediatelyBefore (last);
+			if ( !node )
+				return parent;
+			while ( true ) {
+				// Find the last descendant
+				var childrenAddresses = Object.keys (node.children).sort ( (a, b) => a - b);
+				if ( childrenAddresses.length == 0 )
+					return node;
+				node = node.children[childrenAddresses[childrenAddresses.length - 1]];
+			}
 		}
 	}
 	return this.root;
@@ -3966,25 +3993,25 @@ Mib.prototype.setTableRowDefaultValues = function (name, values) {
 };
 
 Mib.prototype.setScalarRanges = function (name, ranges ) {
-    let provider = this.getProvider(name);
-    provider.constraints = { ranges };
+	let provider = this.getProvider(name);
+	provider.constraints = { ranges };
 };
 
 Mib.prototype.setTableColumnRanges = function(name, column, ranges ) {
-    let provider = this.getProvider(name);
-    let tc = provider.tableColumns;
-    tc[column].constraints = { ranges };
+	let provider = this.getProvider(name);
+	let tc = provider.tableColumns;
+	tc[column].constraints = { ranges };
 };
 
 Mib.prototype.setScalarSizes = function (name, sizes ) {
-    let provider = this.getProvider(name);
-    provider.constraints = { sizes };
+	let provider = this.getProvider(name);
+	provider.constraints = { sizes };
 };
 
 Mib.prototype.setTableColumnSizes = function(name, column, sizes ) {
-    let provider = this.getProvider(name);
-    let tc = provider.tableColumns;
-    tc[column].constraints = { sizes };
+	let provider = this.getProvider(name);
+	let tc = provider.tableColumns;
+	tc[column].constraints = { sizes };
 };
 
 Mib.prototype.registerProviders = function (providers) {

package/package.json

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