slnodejs 6.1.461 → 6.1.466

package/tsOutputs/common/utils/data-cleansing-utils.js

@@ -3,32 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataCleansingUtils = void 0;
 class DataCleansingUtils {
     static removeSensitiveData(request) {
-        const cloneRequest = Object.assign({}, request);
-        DataCleansingUtils.removeSensitiveDataForFieldsWithSideEffects(cloneRequest);
-        DataCleansingUtils.removeSensitiveDataForFieldsAccordingToPatternWithSideEffects(cloneRequest, 'techSpecificInfo.systemProps', DataCleansingUtils.propsFieldPattern);
-        DataCleansingUtils.removeSensitiveDataForFieldsAccordingToPatternWithSideEffects(cloneRequest, 'startDetails.agentInfo.argv', DataCleansingUtils.propsFieldPattern);
-        return cloneRequest;
+        if (request && typeof request === 'object') {
+            const cloneRequest = Object.assign({}, request);
+            DataCleansingUtils.removeSensitiveDataForFieldsAccordingToPatternWithSideEffects(cloneRequest, DataCleansingUtils.sensitiveFieldPattern);
+            return cloneRequest;
+        }
+        return request;
     }
-    static removeSensitiveDataForFieldsAccordingToPatternWithSideEffects(request, field, pattern) {
-        const fieldPath = field.split('.');
-        let requestField = request;
-        while (fieldPath.length && requestField) {
-            const fieldPart = fieldPath.shift();
-            if (!fieldPath.length && requestField[fieldPart]) {
-                Object.keys(requestField[fieldPart]).forEach(key => {
+    static removeSensitiveDataForFieldsAccordingToPatternWithSideEffects(request, pattern) {
+        Object.keys(request).forEach(fieldKey => {
+            if (request[fieldKey]) {
+                Object.keys(request[fieldKey]).forEach(key => {
+                    if (!request[fieldKey][key])
+                        return;
                     if (pattern.test(key)) {
-                        requestField[fieldPart][key] = DataCleansingUtils.REMOVED_VALUE_TEXT;
+                        if (typeof request[fieldKey][key] === 'object' && !Array.isArray(request[fieldKey][key])) {
+                            request[fieldKey][key] = {};
+                        }
+                        else if (Array.isArray(request[fieldKey][key])) {
+                            request[fieldKey][key] = [];
+                        }
+                        else {
+                            request[fieldKey][key] = DataCleansingUtils.REMOVED_VALUE_TEXT;
+                        }
                     }
                 });
+                if (typeof request[fieldKey] === 'object') {
+                    DataCleansingUtils.removeSensitiveDataForFieldsAccordingToPatternWithSideEffects(request[fieldKey], pattern);
+                }
             }
-            else {
-                requestField = requestField[fieldPart];
-            }
-        }
-    }
-    static removeSensitiveDataForFieldsWithSideEffects(request) {
-        DataCleansingUtils.SENSITIVE_DATE_FIELDS_ARRAY.forEach(field => {
-            DataCleansingUtils.removeSensitiveDataForFieldWithSideEffects(request, field);
         });
     }
     static removeSensitiveDataForFieldWithSideEffects(request, field) {
@@ -46,10 +49,7 @@ class DataCleansingUtils {
     }
 }
 exports.DataCleansingUtils = DataCleansingUtils;
-DataCleansingUtils.propsFieldPattern = /\b(token|proxy)\b/i;
+// TODO - what about the tokne? when removed it caused the message not to WORK.
+DataCleansingUtils.sensitiveFieldPattern = /\b(proxy|machineName|ipAddress|ci_dependency_proxy_server|ci_environment_url|ci_server_url|ci_server_host|ci_server_name|circle_repository_url|jenkins_url)\b/i;
 DataCleansingUtils.REMOVED_VALUE_TEXT = '<real value removed due to security configuration>';
-DataCleansingUtils.SENSITIVE_DATE_FIELDS_ARRAY = ['agentInfo.machineInfo.machineName', 'agentInfo.machineInfo.ipAdresses',
-    'agentInfo.envVars.ci_dependency_proxy_server', 'agentInfo.envVars.ci_environment_url',
-    'agentInfo.envVars.ci_server_url', 'agentInfo.envVars.ci_server_host',
-    'agentInfo.envVars.ci_server_name', 'agentInfo.envVars.circle_repository_url', 'agentInfo.envVars.jenkins_url'];
 //# sourceMappingURL=data-cleansing-utils.js.map

package/tsOutputs/common/utils/data-cleansing-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-cleansing-utils.js","sourceRoot":"","sources":["../../../common/utils/data-cleansing-utils.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IAOpB,MAAM,CAAC,mBAAmB,CAAC,OAAY;QAC1C,MAAM,YAAY,qBACX,OAAO,CACb,CAAC;QAEF,kBAAkB,CAAC,2CAA2C,CAAC,YAAY,CAAC,CAAC;QAC7E,kBAAkB,CAAC,6DAA6D,CAC5E,YAAY,EAAE,8BAA8B,EAAE,kBAAkB,CAAC,iBAAiB,CACrF,CAAC;QACF,kBAAkB,CAAC,6DAA6D,CAC5E,YAAY,EAAE,6BAA6B,EAAE,kBAAkB,CAAC,iBAAiB,CACpF,CAAC;QAEF,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,MAAM,CAAC,6DAA6D,CACxE,OAAY,EAAE,KAAa,EAAE,OAAe;QAE5C,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,YAAY,GAAG,OAAO,CAAC;QAC3B,OAAO,SAAS,CAAC,MAAM,IAAI,YAAY,EAAE;YACrC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,EAAE;gBAC9C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBAC/C,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;wBACnB,YAAY,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,kBAAkB,CAAC;qBACxE;gBACL,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;aAC1C;SACJ;IACL,CAAC;IAEO,MAAM,CAAC,2CAA2C,CAAC,OAAO;QAC1D,kBAAkB,CAAC,2BAA2B,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC3D,kBAAkB,CAAC,0CAA0C,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;IACX,CAAC;IACO,MAAM,CAAC,0CAA0C,CAAC,OAAY,EAAE,KAAa;QACjF,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,YAAY,GAAG,OAAO,CAAC;QAC3B,OAAO,SAAS,CAAC,MAAM,IAAI,YAAY,EAAE;YACrC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,EAAE;gBAC9C,YAAY,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,kBAAkB,CAAC;aACnE;iBAAM;gBACH,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;aAC1C;SACJ;IACL,CAAC;;AA1DL,gDA2DC;AA1DkB,oCAAiB,GAAW,oBAAoB,CAAC;AACjD,qCAAkB,GAAW,oDAAoD,CAAC;AAClF,8CAA2B,GAAa,CAAC,mCAAmC,EAAE,kCAAkC;IAC3H,8CAA8C,EAAE,sCAAsC;IACtF,iCAAiC,EAAE,kCAAkC;IACrE,kCAAkC,EAAE,yCAAyC,EAAE,+BAA+B,CAAC,CAAA"}
+{"version":3,"file":"data-cleansing-utils.js","sourceRoot":"","sources":["../../../common/utils/data-cleansing-utils.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IAIpB,MAAM,CAAC,mBAAmB,CAAC,OAAY;QAC1C,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YACxC,MAAM,YAAY,qBACX,OAAO,CACb,CAAC;YAEF,kBAAkB,CAAC,6DAA6D,CAC5E,YAAY,EAAE,kBAAkB,CAAC,qBAAqB,CACzD,CAAC;YAEF,OAAO,YAAY,CAAC;SACvB;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,MAAM,CAAC,6DAA6D,CACxE,OAAY,EAAE,OAAe;QAG7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACpC,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC;wBAAE,OAAO;oBACpC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;wBACnB,IAAI,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;4BACtF,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;yBAC/B;6BAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;4BAC9C,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;yBAC/B;6BAAM;4BACH,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,kBAAkB,CAAC;yBAClE;qBACJ;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE;oBACvC,kBAAkB,CAAC,6DAA6D,CAC5E,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAC7B,CAAC;iBACL;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,MAAM,CAAC,0CAA0C,CAAC,OAAY,EAAE,KAAa;QACjF,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,YAAY,GAAG,OAAO,CAAC;QAC3B,OAAO,SAAS,CAAC,MAAM,IAAI,YAAY,EAAE;YACrC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,EAAE;gBAC9C,YAAY,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,kBAAkB,CAAC;aACnE;iBAAM;gBACH,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;aAC1C;SACJ;IACL,CAAC;;AAzDL,gDA0DC;AAzDG,+EAA+E;AAChE,wCAAqB,GAAW,gKAAgK,CAAC;AACjM,qCAAkB,GAAW,oDAAoD,CAAC"}