net-snmp 3.24.0 → 3.25.0

package/README.md

@@ -1947,6 +1947,8 @@ var myScalarProvider = {
        // e.g. can update the MIB data before responding to the request here
        mibRequest.done ();
     }
+    // Note: handler is optional for scalar providers - if omitted, 
+    // mibRequest.done() is called automatically
 };
 var mib = agent.getMib ();
 mib.registerProvider (myScalarProvider);
@@ -2157,6 +2159,8 @@ objects`, below, for details.
  * `handler` *(optional)* - an optional callback function, which is called before the request to the
  MIB is made.  This could update the MIB value(s) handled by this provider.  If not given,
  the values are simply returned from (or set in) the MIB without any other processing.
+ If no `handler` is provided, the system automatically calls `mibRequest.done()` to complete 
+ the request, making both scalar and table providers fully functional without explicit handlers.
  The callback function takes a `MibRequest` instance, which has a `done()` function.  This
  must be called when finished processing the request.  To signal an error, give a single error object
  in the form of `{errorStatus: <status>}`, where `<status>` is a value from ErrorStatus e.g.
@@ -2704,6 +2708,79 @@ to both register the provider on its internal `Mib` object, *and* send a Registe
 agent for the provider's MIB region.  The latter step is skipped if registering the provider directly
 on the MIB object.
 
+## Simplified Provider Example
+
+AgentX subagents provide automatic request handling for both scalar and table providers, making them simple to implement:
+
+```js
+// Both scalars and tables work with automatic request handling (no explicit handlers needed)
+var stringProvider = {
+    name: "scalarString",
+    type: snmp.MibProviderType.Scalar,
+    oid: "1.3.6.1.4.1.8072.9999.9999.1",
+    scalarType: snmp.ObjectType.OctetString,
+    maxAccess: snmp.MaxAccess["read-write"]
+    // No handler required - automatic fallback will call mibRequest.done()
+};
+
+var intProvider = {
+    name: "scalarInt",
+    type: snmp.MibProviderType.Scalar,
+    oid: "1.3.6.1.4.1.8072.9999.9999.3",
+    scalarType: snmp.ObjectType.Integer,
+    maxAccess: snmp.MaxAccess["read-write"]
+    // No handler required - automatic fallback will call mibRequest.done()
+};
+
+// Table providers also work without explicit handlers
+var tableProvider = {
+    name: "smallIfTable",
+    type: snmp.MibProviderType.Table,
+    oid: "1.3.6.1.4.1.8072.9999.9999.2",
+    maxAccess: snmp.MaxAccess['not-accessible'],
+    tableColumns: [
+        {
+            number: 1,
+            name: "ifIndex",
+            type: snmp.ObjectType.Integer,
+            maxAccess: snmp.MaxAccess['read-only']
+        },
+        {
+            number: 2,
+            name: "ifDescr",
+            type: snmp.ObjectType.OctetString,
+            maxAccess: snmp.MaxAccess['read-write']
+        }
+    ],
+    tableIndex: [
+        {
+            columnName: "ifIndex"
+        }
+    ]
+    // No handler required - automatic fallback works for tables too!
+};
+
+// Register providers and set values
+subagent.registerProvider(stringProvider, function(error, data) {
+    if (!error) {
+        subagent.getMib().setScalarValue("scalarString", "Hello World!");
+    }
+});
+
+subagent.registerProvider(intProvider, function(error, data) {
+    if (!error) {
+        subagent.getMib().setScalarValue("scalarInt", 42);
+    }
+});
+
+subagent.registerProvider(tableProvider, function(error, data) {
+    if (!error) {
+        subagent.getMib().addTableRow("smallIfTable", [1, "lo"]);
+        subagent.getMib().addTableRow("smallIfTable", [2, "eth0"]);
+    }
+});
+```
+
 ## snmp.createSubagent (options)
 
 The `createSubagent ()` function instantiates and returns an instance of the `Subagent`
@@ -2764,6 +2841,11 @@ subsequent `Response` PDU from the master to the `Register` PDU.  This is not to
 with the `handler` optional callback on the provider definition, which is invoked for any
 "request processing" PDU received by the subagent for MIB objects in the registered MIB region.
 
+**Note for AgentX subagents**: Neither scalar nor table providers require explicit `handler` functions.
+If no `handler` is provided, the subagent automatically calls `mibRequest.done()` to complete the request,
+allowing both scalar and table values to be served directly from the MIB without additional processing.
+This greatly simplifies provider definitions - you only need to specify the structure and `maxAccess` properties.
+
 ## subagent.unregisterProvider (name, callback)
 
 Unregisters a previously registered MIB region by the supplied name of the provider.  Sends
@@ -2814,6 +2896,48 @@ Sends a "ping" to the master agent using a `Ping` PDU, to confirm that the maste
 responsive.  The supplied `callback` is called on reception of the subsequent
 `Response` PDU from the master to the `Ping` PDU.
 
+## subagent.setBulkSetHandler (callback)
+
+Sets a bulk set handler for the subagent that will be called for both **TestSet** and **CommitSet** 
+phases of SNMP SET operations. This provides atomic validation capabilities, allowing you to validate 
+all varbinds as a complete set before committing any changes.
+
+The handler callback function receives two arguments:
+* `testSet` - A boolean indicating the phase: `true` for TestSet phase, `false` for CommitSet phase
+* `varbinds` - An array of all varbinds in the SET request
+
+During the TestSet phase (`testSet = true`), you should validate all the requested changes but not 
+apply them. During the CommitSet phase (`testSet = false`), you should apply the previously validated changes.
+
+Example usage:
+
+```js
+subagent.setBulkSetHandler(function(testSet, varbinds) {
+    if (testSet) {
+        // TestSet phase - validate all varbinds atomically
+        console.log("Validating SET operation with", varbinds.length, "varbinds");
+        for (let varbind of varbinds) {
+            // Perform validation logic here
+            if (!isValidValue(varbind.oid, varbind.value)) {
+                throw new Error("Invalid value for " + varbind.oid);
+            }
+        }
+        console.log("All varbinds validated successfully");
+    } else {
+        // CommitSet phase - apply the changes
+        console.log("Committing SET operation");
+        for (let varbind of varbinds) {
+            // Apply the validated changes here
+            applyValue(varbind.oid, varbind.value);
+        }
+        console.log("All changes committed");
+    }
+});
+```
+
+This approach ensures atomic SET operations where either all varbinds in a request succeed or all fail, 
+maintaining data consistency across your MIB implementation.
+
 ## subagent.on ("close", callback)
 
 The `close` event is emitted by the subagent when its underlying TCP socket is closed.
@@ -3569,6 +3693,10 @@ Example programs are included under the module's `example` directory.
 
  * Improve USM error handling compliance with RFC 3414
 
+# Version 3.25.0 - 28/08/2025
+
+ * Add separate AgentX subagent TestSet and CommitSet phases
+
 # License
 
 Copyright (c) 2020 Mark Abrahams <mark@abrahams.co.nz>

package/eslint.config.js

@@ -23,6 +23,8 @@ module.exports = [
                 setTimeout: 'readonly',
                 clearInterval: 'readonly',
                 clearTimeout: 'readonly',
+                setImmediate: 'readonly',
+                clearImmediate: 'readonly',
 
                 // Mocha globals
                 describe: 'readonly',

package/example/agentx-subagent.js

@@ -15,33 +15,39 @@ var stringProvider = {
     name: "scalarString",
     type: snmp.MibProviderType.Scalar,
     oid: "1.3.6.1.4.1.8072.9999.9999.1",
-    scalarType: snmp.ObjectType.OctetString
+    scalarType: snmp.ObjectType.OctetString,
+    maxAccess: snmp.MaxAccess["read-write"]
 };
 var intProvider = {
     name: "scalarInt",
     type: snmp.MibProviderType.Scalar,
     oid: "1.3.6.1.4.1.8072.9999.9999.3",
-    scalarType: snmp.ObjectType.Integer
+    scalarType: snmp.ObjectType.Integer,
+    maxAccess: snmp.MaxAccess["read-write"]
 };
 var tableProvider = {
     name: "smallIfTable",
     type: snmp.MibProviderType.Table,
     oid: "1.3.6.1.4.1.8072.9999.9999.2",
+    maxAccess: snmp.MaxAccess['not-accessible'],
     tableColumns: [
         {
             number: 1,
             name: "ifIndex",
-            type: snmp.ObjectType.Integer
+            type: snmp.ObjectType.Integer,
+            maxAccess: snmp.MaxAccess['read-only']
         },
         {
             number: 2,
             name: "ifDescr",
-            type: snmp.ObjectType.OctetString
+            type: snmp.ObjectType.OctetString,
+            maxAccess: snmp.MaxAccess['read-write']
         },
         {
             number: 3,
             name: "ifType",
-            type: snmp.ObjectType.Integer
+            type: snmp.ObjectType.Integer,
+            maxAccess: snmp.MaxAccess['read-only']
         }
     ],
     tableIndex: [
@@ -49,10 +55,7 @@ var tableProvider = {
             columnName: "ifIndex"
         }
     ],
-    handler: function (mibRequest) {
-        // e.g. can update the table before responding to the request here
-        mibRequest.done ();
-    }
+
 };
 
 agent.open(function (error, data) {
@@ -66,9 +69,41 @@ agent.open(function (error, data) {
         agent.registerProvider (tableProvider, null);
         agent.getMib ().addTableRow ("smallIfTable", [1, "lo", 24]);
         agent.getMib ().addTableRow ("smallIfTable", [2, "eth0", 6]);
+        
+        console.log("AgentX subagent ready and providers registered successfully.");
+        
         agent.on("close", function() {
             console.log ("Subagent socket closed");
         });
+
+        // Handle graceful shutdown on Ctrl-C
+        process.on('SIGINT', function() {
+            console.log('\nReceived SIGINT. Cleaning up...');
+            
+            // Unregister all providers
+            try {
+                agent.unregisterProvider("scalarString", function(err, data) {
+                    if (err) console.error("Error unregistering scalarString:", err);
+                });
+                agent.unregisterProvider("scalarInt", function(err, data) {
+                    if (err) console.error("Error unregistering scalarInt:", err);
+                });
+                agent.unregisterProvider("smallIfTable", function(err, data) {
+                    if (err) console.error("Error unregistering smallIfTable:", err);
+                });
+            } catch (e) {
+                console.error("Error during unregistration:", e.message);
+            }
+
+            // Close the agent after a brief delay to allow unregistrations to complete
+            setTimeout(function() {
+                agent.close(function(err) {
+                    if (err) console.error("Error closing agent:", err);
+                    console.log("Agent closed gracefully");
+                    process.exit(0);
+                });
+            }, 100);
+        });
     }
 });
 

package/index.js

@@ -213,6 +213,8 @@ var AgentXPduType = {
 	17: "RemoveAgentCaps",
 	18: "Response"
 };
+const agentXPduTypesRequiringReadAccess = [ 5, 6, 7];
+const agentXPduTypesRequiringWriteAccess = [ 8, 9, 10, 11, 14, 15, 16, 17 ];
 
 _expandConstantObject (AgentXPduType);
 
@@ -3983,17 +3985,9 @@ MibNode.prototype.getConstraintsFromProvider = function () {
 	}
 };
 
-MibNode.prototype.setValue = function (typeFromSet, valueFromSet) {
+MibNode.prototype.validateValue = function (typeFromSet, valueFromSet) {
 	const constraints = this.getConstraintsFromProvider ();
-	try {
-		const castValue = ObjectTypeUtil.castSetValue (typeFromSet, valueFromSet, constraints);
-		this.value = castValue;
-		return true;
-	} catch (error) {
-		console.error ("Error setting value: " + error.message);
-		return false;
-	}
-
+	return ObjectTypeUtil.isValid (typeFromSet, valueFromSet, constraints);
 };
 
 MibNode.prototype.getInstanceNodeForTableRow = function () {
@@ -5253,11 +5247,12 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 	var varbindsLength = requestPdu.varbinds.length;
 	var responsePdu = requestPdu.getResponsePduForRequest ();
 	var mibRequests = [];
-	var handlers = [];
 	var createResult = [];
 	var oldValues = [];
 	var securityName = requestMessage.version == Version3 ? requestMessage.user.name : requestMessage.community;
 
+	const isSetRequest = requestPdu.type === PduType.SetRequest;
+
 	for ( let i = 0; i < requestPdu.varbinds.length; i++ ) {
 		let instanceNode = this.mib.lookup (requestPdu.varbinds[i].oid);
 		let providerNode;
@@ -5287,7 +5282,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 			});
 			const ancestorProvider = this.mib.getAncestorProviderFromOid(requestPdu.varbinds[i].oid);
 			if ( ancestorProvider ) {
-				handlers[i] = function getNsiHandler (mibRequestForNsi) {
+				mibRequests[i].handler = function getNsiHandler (mibRequestForNsi) {
 					mibRequestForNsi.done ({
 						errorStatus: ErrorStatus.NoError,
 						type: ObjectType.NoSuchInstance,
@@ -5295,7 +5290,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 					});
 				};
 			} else {
-				handlers[i] = function getNsoHandler (mibRequestForNso) {
+				mibRequests[i].handler = function getNsoHandler (mibRequestForNso) {
 					mibRequestForNso.done ({
 						errorStatus: ErrorStatus.NoError,
 						type: ObjectType.NoSuchObject,
@@ -5310,7 +5305,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 					operation: requestPdu.type,
 					oid: requestPdu.varbinds[i].oid
 				});
-				handlers[i] = function getNsiHandler (mibRequestForNsi) {
+				mibRequests[i].handler = function getNsiHandler (mibRequestForNsi) {
 					mibRequestForNsi.done ({
 						errorStatus: ErrorStatus.NoError,
 						type: ObjectType.NoSuchInstance,
@@ -5323,7 +5318,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 					operation: requestPdu.type,
 					oid: requestPdu.varbinds[i].oid
 				});
-				handlers[i] = function getRanaHandler (mibRequestForRana) {
+				mibRequests[i].handler = function getRanaHandler (mibRequestForRana) {
 					mibRequestForRana.done ({
 						errorStatus: ErrorStatus.NoAccess,
 						type: ObjectType.Null,
@@ -5337,14 +5332,14 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 					operation: requestPdu.type,
 					oid: requestPdu.varbinds[i].oid
 				});
-				handlers[i] = function getAccessDeniedHandler (mibRequestForAccessDenied) {
+				mibRequests[i].handler = function getAccessDeniedHandler (mibRequestForAccessDenied) {
 					mibRequestForAccessDenied.done ({
 						errorStatus: ErrorStatus.NoAccess,
 						type: ObjectType.Null,
 						value: null
 					});
 				};
-			} else if ( requestPdu.type === PduType.SetRequest &&
+			} else if ( isSetRequest &&
 					providerNode.provider.type == MibProviderType.Table &&
 					typeof (rowStatusColumn = providerNode.provider.tableColumns.reduce(
 								(acc, current) => current.rowStatus ? current.number : acc, null )) == "number" &&
@@ -5380,7 +5375,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 								operation: requestPdu.type,
 								oid: requestPdu.varbinds[i].oid
 							});
-							handlers[i] = getIcsHandler;
+							mibRequests[i].handler = getIcsHandler;
 						}
 						break;
 
@@ -5394,7 +5389,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 								operation: requestPdu.type,
 								oid: requestPdu.varbinds[i].oid
 							});
-							handlers[i] = getIcsHandler;
+							mibRequests[i].handler = getIcsHandler;
 						}
 						break;
 
@@ -5415,16 +5410,16 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 							operation: requestPdu.type,
 							oid: requestPdu.varbinds[i].oid
 						});
-						handlers[i] = getIcsHandler;
+						mibRequests[i].handler = getIcsHandler;
 						break;
 				}
 			}
 
-			if ( requestPdu.type === PduType.SetRequest && ! createResult[i] ) {
+			if ( isSetRequest && ! createResult[i] ) {
 				oldValues[i] = instanceNode.value;
 			}
 
-			if ( ! handlers[i] ) {
+			if ( ! mibRequests[i] ) {
 				mibRequests[i] = new MibRequest ({
 					operation: requestPdu.type,
 					providerNode: providerNode,
@@ -5432,38 +5427,67 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 					oid: requestPdu.varbinds[i].oid
 				});
 
-				if ( requestPdu.type == PduType.SetRequest ) {
-					mibRequests[i].setType = requestPdu.varbinds[i].type;
-					mibRequests[i].setValue = requestPdu.varbinds[i].requestValue || requestPdu.varbinds[i].value;
+				mibRequests[i].handler = providerNode.provider.handler;
+
+				if ( isSetRequest ) {
+					mibRequests[i].setType = instanceNode.valueType;
+					mibRequests[i].setValue = requestPdu.varbinds[i].requestValue ?? requestPdu.varbinds[i].value;
+					try {
+						mibRequests[i].setValue =
+							ObjectTypeUtil.castSetValue (mibRequests[i].setType, mibRequests[i].setValue);
+
+						if ( ! mibRequests[i].instanceNode.validateValue (mibRequests[i].setType, mibRequests[i].setValue) ) {
+							mibRequests[i].handler = function badValueHandler (request) {
+								request.done ({
+									errorStatus: ErrorStatus.BadValue,
+									type: ObjectType.Null,
+									value: null,
+								});
+							};
+						}
+					} catch (e) {
+						debug('Invalid value for type', e, mibRequests[i]);
+						mibRequests[i].handler = function wrongTypeHandler (request) {
+							request.done ({
+								errorStatus: ErrorStatus.WrongType,
+								type: ObjectType.Null,
+								value: null,
+							});
+						};
+					}
 				}
-				handlers[i] = providerNode.provider.handler;
 			}
 		}
 
 		(function (savedIndex) {
-			let responseVarbind;
-			mibRequests[savedIndex].done = function (error) {
+			const mibRequest = mibRequests[savedIndex];
+			mibRequest.done = function (error) {
+				mibRequest.error = error ?? { errorStatus: ErrorStatus.NoError };
+				let responseVarbind;
 				let rowIndex = null;
 				let row = null;
 				let deleted = false;
 				let column = -1;
 				responseVarbind = {
-					oid: mibRequests[savedIndex].oid
+					oid: mibRequest.oid
 				};
 				if ( error ) {
-					if ( (typeof responsePdu.errorStatus == "undefined" || responsePdu.errorStatus == ErrorStatus.NoError) && error.errorStatus != ErrorStatus.NoError ) {
+					if ( (typeof responsePdu.errorStatus == "undefined" || responsePdu.errorStatus == ErrorStatus.NoError) &&
+							error.errorStatus != ErrorStatus.NoError ) {
 						responsePdu.errorStatus = error.errorStatus;
 						responsePdu.errorIndex = savedIndex + 1;
 					}
 					responseVarbind.type = error.type || ObjectType.Null;
-					responseVarbind.value = error.value || null;
+					responseVarbind.value = error.value ?? null;
 					//responseVarbind.errorStatus: error.errorStatus
 					if ( error.errorStatus != ErrorStatus.NoError ) {
 						responseVarbind.errorStatus = error.errorStatus;
 					}
 				} else {
-					let provider = providerNode ? providerNode.provider : null;
-					let providerName = provider ? provider.name : null;
+					const instanceNode = mibRequest.instanceNode;
+					const providerNode = mibRequest.providerNode;
+					const provider = providerNode ? providerNode.provider : null;
+					const providerName = provider ? provider.name : null;
 					let subOid;
 					let subAddr;
 					if ( providerNode && providerNode.provider && providerNode.provider.type == MibProviderType.Table ) {
@@ -5474,7 +5498,7 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 						rowIndex = Mib.getRowIndexFromOid( subAddr.join("."), provider.tableIndex );
 						row = me.mib.getTableRowCells ( providerName, rowIndex );
 					}
-					if ( requestPdu.type == PduType.SetRequest ) {
+					if ( isSetRequest && mibRequest.commitSet ) {
 						// Is this a RowStatus column with a value of 6 (delete)?
 						let rowStatusColumn = provider.type == MibProviderType.Table
 							? provider.tableColumns.reduce( (acc, current) => current.rowStatus ? current.number : acc, null )
@@ -5498,26 +5522,16 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 
 						} else {
 							// No special handling required. Just save the new value.
-							const setResult = mibRequests[savedIndex].instanceNode.setValue (
-								requestPdu.varbinds[savedIndex].type,
-								requestPdu.varbinds[savedIndex].value
-							);
-							if ( ! setResult ) {
-								if ( typeof responsePdu.errorStatus == "undefined" || responsePdu.errorStatus == ErrorStatus.NoError ) {
-									responsePdu.errorStatus = ErrorStatus.WrongValue;
-									responsePdu.errorIndex = savedIndex + 1;
-								}
-								responseVarbind.errorStatus = ErrorStatus.WrongValue;
-							}
+							mibRequest.instanceNode.value = mibRequest.setValue;
 						}
 					}
 					if ( ( requestPdu.type == PduType.GetNextRequest || requestPdu.type == PduType.GetBulkRequest ) &&
 							requestPdu.varbinds[savedIndex].type == ObjectType.EndOfMibView ) {
 						responseVarbind.type = ObjectType.EndOfMibView;
 					} else {
-						responseVarbind.type = mibRequests[savedIndex].instanceNode.valueType;
+						responseVarbind.type = mibRequest.instanceNode.valueType;
 					}
-					responseVarbind.value = mibRequests[savedIndex].instanceNode.value;
+					responseVarbind.value = mibRequest.instanceNode.value;
 					if ( responseVarbind.value === undefined || responseVarbind.value === null ) {
 						responseVarbind.type = ObjectType.NoSuchInstance;
 					}
@@ -5528,16 +5542,19 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 				if ( requestPdu.type == PduType.GetNextRequest || requestPdu.type == PduType.GetNextRequest ) {
 					responseVarbind.previousOid = requestPdu.varbinds[savedIndex].previousOid;
 				}
-				if ( requestPdu.type == PduType.SetRequest ) {
+				const isTestSet = mibRequest.testSet;
+				if ( isSetRequest ) {
+					if ( mibRequest.testSet ) {
+						delete mibRequest.testSet;
+						mibRequest.commitSet = true;
+						if ( mibRequest.error.errorStatus === ErrorStatus.NoError )
+							delete mibRequest.error;
+					}
 					if ( oldValues[savedIndex] !== undefined ) {
 						responseVarbind.oldValue = oldValues[savedIndex];
 					}
-					responseVarbind.requestType = requestPdu.varbinds[savedIndex].type;
-					if ( requestPdu.varbinds[savedIndex].requestValue ) {
-						responseVarbind.requestValue = ObjectTypeUtil.castSetValue (requestPdu.varbinds[savedIndex].type, requestPdu.varbinds[savedIndex].requestValue);
-					} else {
-						responseVarbind.requestValue = ObjectTypeUtil.castSetValue (requestPdu.varbinds[savedIndex].type, requestPdu.varbinds[savedIndex].value);
-					}
+					responseVarbind.requestType = mibRequests[savedIndex].setType;
+					responseVarbind.requestValue = mibRequests[savedIndex].setValue;
 				}
 				if ( createResult[savedIndex] ) {
 					responseVarbind.autoCreated = true;
@@ -5555,16 +5572,56 @@ Agent.prototype.request = function (socket, requestMessage, rinfo) {
 				}
 				me.setSingleVarbind (responsePdu, savedIndex, responseVarbind);
 				if ( ++varbindsCompleted == varbindsLength) {
+					// If all varbind have been tested, apply
+					// the handlers again in commit mode.
+					if (isTestSet && !responsePdu.errorIndex) {
+						varbindsCompleted = 0;
+						setImmediate(() => applySetHandlers(/*testSet=*/false));
+						return;
+					}
 					me.sendResponse.call (me, socket, rinfo, requestMessage, responsePdu);
 				}
 			};
+			if ( isSetRequest )
+				mibRequest.testSet = true;
 		})(i);
-		if ( handlers[i] ) {
-			handlers[i] (mibRequests[i]);
-		} else {
-			mibRequests[i].done ();
-		}
 	}
+	const applyHandlers = testSet => {
+		for ( const mibRequest of mibRequests ) {
+			if ( mibRequest.error === undefined && testSet === !!mibRequest.testSet ) {
+				if ( mibRequest.handler ) {
+					mibRequest.handler (mibRequest);
+				} else {
+					mibRequest.done ();
+				}
+			}
+		}
+	};
+	const applySetHandlers = testSet => {
+		if ( this.bulkSetHandler ) {
+			const errorStatus = this.bulkSetHandler( mibRequests, this.mib, testSet ) ?? ErrorStatus.NoError;
+			if ( errorStatus !== ErrorStatus.NoError ) {
+				for ( const mibRequest of mibRequests ) {
+					if ( mibRequest.error === undefined ) {
+						mibRequest.done ({
+							errorStatus,
+							type: ObjectType.Null,
+							value: null
+						});
+					}
+				}
+			}
+		}
+		applyHandlers(testSet);
+	};
+	if ( isSetRequest )
+		applySetHandlers(/*testSet=*/true);
+	else
+		applyHandlers(false);
+};
+
+Agent.prototype.setBulkSetHandler = function setBulkSetHandler(cb) {
+	this.bulkSetHandler = cb;
 };
 
 Agent.prototype.getRequest = function (socket, requestMessage, rinfo) {
@@ -5915,6 +5972,13 @@ AgentXPdu.createFromVariables = function (vars) {
 			pdu.index = vars.index || 0;
 			pdu.varbinds = vars.varbinds || null;
 			break;
+		case AgentXPduType.TestSet:
+			pdu.varbinds = vars.varbinds || null;
+			break;
+		case AgentXPduType.CommitSet:
+		case AgentXPduType.UndoSet:
+		case AgentXPduType.CleanupSet:
+			break;
 		default:
 			// unsupported PDU type - should never happen as we control these
 			throw new RequestInvalidError ("Unknown PDU type '" + pdu.pduType
@@ -6339,35 +6403,39 @@ Subagent.prototype.onMsg = function (buffer, rinfo) {
 	debug ("Received AgentX " + AgentXPduType[pdu.pduType] + " PDU");
 	debug (pdu);
 
-	switch (pdu.pduType) {
-		case AgentXPduType.Response:
-			this.response (pdu);
-			break;
-		case AgentXPduType.Get:
-			this.getRequest (pdu);
-			break;
-		case AgentXPduType.GetNext:
-			this.getNextRequest (pdu);
-			break;
-		case AgentXPduType.GetBulk:
-			this.getBulkRequest (pdu);
-			break;
-		case AgentXPduType.TestSet:
-			this.testSet (pdu);
-			break;
-		case AgentXPduType.CommitSet:
-			this.commitSet (pdu);
-			break;
-		case AgentXPduType.UndoSet:
-			this.undoSet (pdu);
-			break;
-		case AgentXPduType.CleanupSet:
-			this.cleanupSet (pdu);
-			break;
-		default:
-			// Unknown PDU type - shouldn't happen as master agents shouldn't send administrative PDUs
-			throw new RequestInvalidError ("Unknown PDU type '" + pdu.pduType
-					+ "' in request");
+	try {
+		switch (pdu.pduType) {
+			case AgentXPduType.Response:
+				this.response (pdu);
+				break;
+			case AgentXPduType.Get:
+				this.getRequest (pdu);
+				break;
+			case AgentXPduType.GetNext:
+				this.getNextRequest (pdu);
+				break;
+			case AgentXPduType.GetBulk:
+				this.getBulkRequest (pdu);
+				break;
+			case AgentXPduType.TestSet:
+				this.testSet (pdu);
+				break;
+			case AgentXPduType.CommitSet:
+				this.commitSet (pdu);
+				break;
+			case AgentXPduType.UndoSet:
+				this.undoSet (pdu);
+				break;
+			case AgentXPduType.CleanupSet:
+				this.cleanupSet (pdu);
+				break;
+			default:
+				// Unknown PDU type - shouldn't happen as master agents shouldn't send administrative PDUs
+				throw new RequestInvalidError ("Unknown PDU type '" + pdu.pduType
+						+ "' in request");
+		}
+	} catch (e) {
+		console.error(e);
 	}
 };
 
@@ -6406,82 +6474,141 @@ Subagent.prototype.response = function (pdu) {
 	}
 };
 
+Subagent.prototype.isAllowed = function (pduType, provider, instanceNode) {
+	const requestedAccess =
+		agentXPduTypesRequiringReadAccess.includes(pduType)? MaxAccess["read-only"] :
+		agentXPduTypesRequiringWriteAccess.includes(pduType)? MaxAccess["read-write"] :
+		undefined;
+
+	if (requestedAccess === undefined)
+		return true;
+
+	if (provider.type === MibProviderType.Scalar)
+		return provider.maxAccess >= requestedAccess;
+
+	// It's a table column. Use that column's maxAccess.
+	const column = instanceNode.getTableColumnFromInstanceNode();
+
+	// In the typical case, we could use (column - 1) to index
+	// into tableColumns to get to the correct entry. There is no
+	// guarantee, however, that column numbers in the OID are
+	// necessarily consecutive; theoretically some could be
+	// missing. We'll therefore play it safe and search for the
+	// specified column entry.
+
+	const columnEntry = provider.tableColumns.find(entry => entry.number === column);
+	const maxAccess = columnEntry ? columnEntry.maxAccess || MaxAccess['not-accessible'] : MaxAccess['not-accessible'];
+	return maxAccess >= requestedAccess;
+};
+
+
 Subagent.prototype.request = function (pdu, requestVarbinds) {
 	const me = this;
 	const varbindsLength = requestVarbinds.length;
 	const responseVarbinds = [];
 	const responsePdu = pdu.getResponsePduForRequest ();
+	const mibRequests = [];
 	let varbindsCompleted = 0;
+	let firstVarbindError;
+	const isTestSet = pdu.pduType == AgentXPduType.TestSet;
+	const isSetRequest = isTestSet ||
+		pdu.pduType == AgentXPduType.CommitSet ||
+		pdu.pduType == AgentXPduType.UndoSet;
 
 	for ( let i = 0; i < varbindsLength; i++ ) {
 		const requestVarbind = requestVarbinds[i];
-		var instanceNode = this.mib.lookup (requestVarbind.oid);
-		var providerNode;
-		var mibRequest;
-		var handler;
-		var responseVarbindType;
+		const instanceNode = this.mib.lookup (requestVarbind.oid);
+		let providerNode;
+		let responseVarbindType;
 
 		if ( ! instanceNode ) {
-			mibRequest = new MibRequest ({
+			mibRequests[i] = new MibRequest ({
 				operation: pdu.pduType,
 				oid: requestVarbind.oid
 			});
-			handler = function getNsoHandler (mibRequestForNso) {
-				mibRequestForNso.done ({
+			mibRequests[i].error = {
 					errorStatus: ErrorStatus.NoError,
 					errorIndex: 0,
 					type: ObjectType.NoSuchObject,
 					value: null
-				});
 			};
 		} else {
 			providerNode = this.mib.getProviderNodeForInstance (instanceNode);
 			if ( ! providerNode ) {
-				mibRequest = new MibRequest ({
+				mibRequests[i] = new MibRequest ({
 					operation: pdu.pduType,
 					oid: requestVarbind.oid
 				});
-				handler = function getNsiHandler (mibRequestForNsi) {
-					mibRequestForNsi.done ({
+				mibRequests[i].error = {
 						errorStatus: ErrorStatus.NoError,
 						errorIndex: 0,
 						type: ObjectType.NoSuchInstance,
 						value: null
-					});
 				};
 			} else {
-				mibRequest = new MibRequest ({
+				mibRequests[i] = new MibRequest ({
 					operation: pdu.pduType,
 					providerNode: providerNode,
 					instanceNode: instanceNode,
-					oid: requestVarbind.oid
+					oid: requestVarbind.oid,
 				});
-				if ( pdu.pduType == AgentXPduType.TestSet ) {
-					mibRequest.setType = requestVarbind.type;
-					mibRequest.setValue = requestVarbind.value;
+				mibRequests[i].handler = providerNode.provider.handler;
+				if ( ! me.isAllowed(pdu.pduType, mibRequests[i].providerNode?.provider, mibRequests[i].instanceNode) ) {
+					mibRequests[i].error = {
+						errorStatus: ErrorStatus.NoAccess,
+						errorIndex: i + 1,
+						type: ObjectType.Null,
+						value: null
+					};
+				}
+				if ( isSetRequest ) {
+					mibRequests[i].setType = instanceNode.valueType;
+					mibRequests[i].setValue = requestVarbind.requestValue ?? requestVarbind.value;
+					mibRequests[i].requestIndex = i + 1;
+					try {
+						mibRequests[i].setValue =
+							ObjectTypeUtil.castSetValue (mibRequests[i].setType, mibRequests[i].setValue);
+
+						if ( ! mibRequests[i].instanceNode.validateValue (mibRequests[i].setType, mibRequests[i].setValue) ) {
+							mibRequests[i].error = {
+								errorStatus: ErrorStatus.BadValue,
+								errorIndex: i + 1,
+								type: mibRequests[i].setType,
+								value: mibRequests[i].setValue,
+							};
+						}
+					} catch (e) {
+						debug('Invalid value for type', e, mibRequests[i]);
+						mibRequests[i].error = {
+							errorStatus: ErrorStatus.WrongType,
+							errorIndex: i + 1,
+							type: mibRequests[i].setType,
+							value: mibRequests[i].setValue,
+						};
+					}
 				}
-				handler = providerNode.provider.handler;
 			}
 		}
 
 		(function (savedIndex) {
+			const mibRequest = mibRequests[savedIndex];
+			const requestVarbind = requestVarbinds[savedIndex];
 			mibRequest.done = function (error) {
+				mibRequest.error = error ?? { errorStatus: ErrorStatus.NoError };
 				let responseVarbind;
 				if ( error ) {
 					responseVarbind = {
 						oid: mibRequest.oid,
 						type: error.type || ObjectType.Null,
-						value: error.value || null
+						value: error.value ?? null
 					};
-					if ( (typeof responsePdu.errorStatus == "undefined" || responsePdu.errorStatus == ErrorStatus.NoError) && error.errorStatus != ErrorStatus.NoError ) {
-						responsePdu.error = error.errorStatus;
-						responsePdu.index = savedIndex + 1;
-					}
+					error.errorIndex = savedIndex + 1;
+					firstVarbindError = firstVarbindError ?? error;
 					if ( error.errorStatus != ErrorStatus.NoError ) {
 						responseVarbind.errorStatus = error.errorStatus;
 					}
 				} else {
-					if ( pdu.pduType == AgentXPduType.TestSet ) {
+					if ( isTestSet ) {
 						// more tests?
 					} else if ( pdu.pduType == AgentXPduType.CommitSet ) {
 						me.setTransactions[pdu.transactionID].originalValue = mibRequest.instanceNode.value;
@@ -6501,23 +6628,54 @@ Subagent.prototype.request = function (pdu, requestVarbinds) {
 						value: mibRequest.instanceNode.value
 					};
 				}
-				responseVarbinds[savedIndex] = responseVarbind;
-				if ( ++varbindsCompleted == varbindsLength) {
-					if ( pdu.pduType == AgentXPduType.TestSet || pdu.pduType == AgentXPduType.CommitSet
-							|| pdu.pduType == AgentXPduType.UndoSet) {
+				responseVarbinds[savedIndex] = mibRequest.response = responseVarbind;
+				if ( ++varbindsCompleted == varbindsLength ) {
+					if ( isSetRequest ) {
+						responsePdu.error = firstVarbindError?.errorStatus ?? 0;
+						responsePdu.index = firstVarbindError?.errorIndex ?? 0;
 						me.sendResponse.call (me, responsePdu);
 					} else {
 						me.sendResponse.call (me, responsePdu, responseVarbinds);
 					}
 				}
 			};
+			if ( isTestSet )
+				mibRequests[i].testSet = true;
+			else if ( pdu.pduType == AgentXPduType.CommitSet )
+				mibRequests[i].commitSet = true;
+			if ( mibRequest.error )
+				mibRequest.done(mibRequest.error);
 		})(i);
-		if ( handler ) {
-			handler (mibRequest);
-		} else {
-			mibRequest.done ();
+	}
+	if ( isSetRequest && this.bulkSetHandler ) {
+		const errorStatus = this.bulkSetHandler( mibRequests, this.mib, isTestSet ) ?? ErrorStatus.NoError;
+		if ( errorStatus !== ErrorStatus.NoError ) {
+			for ( const mibRequest of mibRequests ) {
+				if ( !mibRequest.response ) {
+					mibRequest.done ({
+						errorStatus,
+						type: ObjectType.Null,
+						value: null
+					});
+				}
+			}
+			return;
 		}
 	}
+	for ( let i = 0; i < requestVarbinds.length; i++ ) {
+		if ( !mibRequests[i].response ) {
+			const handler = mibRequests[i].handler;
+			if ( handler ) {
+				handler (mibRequests[i]);
+			} else {
+				mibRequests[i].done ();
+			}
+		}
+	}
+};
+
+Subagent.prototype.setBulkSetHandler = function setBulkSetHandler(cb) {
+	this.bulkSetHandler = cb;
 };
 
 Subagent.prototype.addGetNextVarbind = function (targetVarbinds, startOid) {
@@ -6680,6 +6838,7 @@ exports.ErrorStatus = ErrorStatus;
 exports.TrapType = TrapType;
 exports.ObjectType = ObjectType;
 exports.PduType = PduType;
+exports.AgentXPdu = AgentXPdu;
 exports.AgentXPduType = AgentXPduType;
 exports.MibProviderType = MibProviderType;
 exports.SecurityLevel = SecurityLevel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "net-snmp",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "description": "JavaScript implementation of the Simple Network Management Protocol (SNMP)",
   "author": "Mark Abrahams <mark@abrahams.co.nz>",
   "license": "MIT",

package/test/subagent.test.js

@@ -357,7 +357,7 @@ describe('Subagent', function() {
                  subagent.getMib().setScalarValue('testScalar', 100);
              });
 
-            xit('manages set transactions correctly', function() {
+            it('manages set transactions correctly', function() {
                 // Create proper AgentXPdu objects using createFromVariables
                 const testSetPdu = snmp.AgentXPdu.createFromVariables({
                     pduType: snmp.AgentXPduType.TestSet,
@@ -383,7 +383,7 @@ describe('Subagent', function() {
                 assert(!subagent.setTransactions[123]);
             });
 
-            xit('handles unexpected transaction IDs', function() {
+            it('handles unexpected transaction IDs', function() {
                 const commitSetPdu = snmp.AgentXPdu.createFromVariables({
                     pduType: snmp.AgentXPduType.CommitSet,
                     sessionID: subagent.sessionID,