Merge pull request #14 from sunnyrajrathod/master

Sunny Raj Rathod · web-flow · commit 8f9d9a901ffb · 2016-12-22T21:26:28.000+05:30
- Fix for #13.
diff --git a/lib/apicontrollersbase.js b/lib/apicontrollersbase.js
@@ -78,7 +78,7 @@ class APIOperationBase {
 
 		var obj = this;
 
-		logger.debug('Request: ' + JSON.stringify(this._request, 2, null));
+		logger.debug(JSON.stringify(this._request, 2, null));
 
 		var reqOpts = {
 			url: this._endpoint,
@@ -103,7 +103,7 @@ class APIOperationBase {
 			{
 				//TODO: slice added due to BOM character. remove once BOM character is removed.
 				var responseObj = JSON.parse(body.slice(1));
-				logger.debug('Response: ' + JSON.stringify(responseObj, 2, null));
+				logger.debug(JSON.stringify(responseObj, 2, null));
 				obj._response = responseObj;
 				/*
 				var jsonResponse = JSON.stringify(body);
diff --git a/lib/config.js b/lib/config.js
@@ -5,7 +5,7 @@ var config = {
 	'timeout': 120000,
 	'clientId': 'sdk-node-' + pkg.version,
 	'logger': {
-		'enabled': true,
+		'enabled': false,
 		'location': './',
 		//logging levels - { error: 0, warn: 1, info: 2, verbose: 3, debug: 4, silly: 5 
 		'level': 'debug'
diff --git a/lib/logger.js b/lib/logger.js
@@ -3,19 +3,66 @@ var config = require('./config').config;
 
 var logger;
 
+var sensitiveFields = ['cardCode', 'cardNumber', 'expirationDate', 'accountNumber', 'nameOnAccount', 'transactionKey', 'email', 'phoneNumber', 'faxNumber', 'dateOfBirth'];
+
+function isJson(str) {
+    try {
+        JSON.parse(str);
+    } catch (e) {
+        return false;
+    }
+    return true;
+}
+
 if(config.logger.enabled === true) {
 	logger = new (winston.Logger)({
 		transports: [
 			new (winston.transports.File)({filename: config.logger.location + '/sdk-node.log', level: config.logger.level})
 		]
 	});
+
+	//Adding filter for sensitive fields that should not be logged.
+	logger.filters.push(function(level, msg, timestamp){
+		if(isJson(msg))
+		{
+			try{
+				return maskSensitiveFields(JSON.parse(msg));
+			}
+			catch (e)
+			{
+				return 'Error while logging the message.';
+			}
+		}
+		else
+			return msg;
+	});
 }
 else {
 	logger = new (winston.Logger)({
 		transports: []
 	});
 }
 
-//logging levels - { error: 0, warn: 1, info: 2, verbose: 3, debug: 4, silly: 5 }
+function maskSensitiveFields(jsonMsg){
+
+	if (jsonMsg instanceof Object) {
+
+		var prop;
+
+		for (prop in jsonMsg){
+			var isFieldSensitive = (sensitiveFields.indexOf(prop) > -1);
+
+			if(isFieldSensitive === true)
+			{
+				jsonMsg[prop] = new Array(jsonMsg[prop].length + 1).join('X');
+			}
+			else if (jsonMsg.hasOwnProperty(prop)){
+				maskSensitiveFields(jsonMsg[prop]);  
+			}
+		}
+	}
+	
+    return JSON.stringify(jsonMsg);
+}
 
 module.exports.logger = logger;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "authorizenet",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "nodejs sdk for Authorize.Net",
   "main": "lib/authorizenet.js",
   "directories": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "authorizenet",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "nodejs sdk for Authorize.Net",`
`5`	`5`	`"main": "lib/authorizenet.js",`
`6`	`6`	`"directories": {`