FABN-1582: Fix leakage of Gateway confguration settings (#259)

Certain configuration settings could end up sharing objects between multiple Gateway instances, so connection options supplied to one Gateway connection could modify the connection options of other Gateway instances or the defaults.

Signed-off-by: Mark S. Lewis <[email protected]>

Author: bestbeforetoday

fabric-network/src/gateway.ts

@@ -57,22 +57,6 @@ export interface DefaultQueryHandlerOptions {
 	timeout?: number;
 }
 
-const defaultOptions = Object.freeze({
-	queryHandlerOptions: {
-		timeout: 30, // 30 seconds
-		strategy: QueryStrategies.MSPID_SCOPE_SINGLE
-	},
-	eventHandlerOptions: {
-		endorseTimeout: 30, // 30 seconds
-		commitTimeout: 300, // 5 minutes
-		strategy: EventStrategies.MSPID_SCOPE_ALLFORTX
-	},
-	discovery: {
-		enabled: true,
-		asLocalhost: true
-	}
-});
-
 export function mergeOptions<B, E>(currentOptions: B, additionalOptions: E): B & E {
 	const result = currentOptions as B & E;
 	for (const prop in additionalOptions) {
@@ -273,7 +257,23 @@ export class Gateway {
 		const method = 'connect';
 		logger.debug('%s - start', method);
 
-		this.options = mergeOptions(mergeOptions({}, defaultOptions), options);
+		const defaultOptions = {
+			queryHandlerOptions: {
+				timeout: 30, // 30 seconds
+				strategy: QueryStrategies.MSPID_SCOPE_SINGLE
+			},
+			eventHandlerOptions: {
+				endorseTimeout: 30, // 30 seconds
+				commitTimeout: 300, // 5 minutes
+				strategy: EventStrategies.MSPID_SCOPE_ALLFORTX
+			},
+			discovery: {
+				enabled: true,
+				asLocalhost: true
+			}
+		};
+
+		this.options = mergeOptions(defaultOptions, options);
 		logger.debug('connection options: %j', options);
 
 		let loadCcp = false;

package-lock.json

@@ -61,13 +61,13 @@
     "elliptic": "^6.3.2",
     "eslint": "^6.8.0",
     "fabric-ca-client": "file:./fabric-ca-client",
-    "fabric-client": "^1.4.8",
+    "fabric-client": "^1.4.9",
     "fabric-common": "file:./fabric-common",
     "fabric-network": "file:./fabric-network",
     "fabric-protos": "file:./fabric-protos",
     "ink-docstrap": "^1.3.2",
     "jsdoc": "^3.6.3",
-    "jsrsasign": "^8.0.15",
+    "jsrsasign": "^8.0.19",
     "mocha": "^7.1.2",
     "nano": "^8.2.2",
     "npm-run-all": "^4.1.5",