aboutsummaryrefslogtreecommitdiffstats
path: root/lib/utils.js
diff options
context:
space:
mode:
authorAlex Shatov <alexs@att.com>2018-09-17 16:21:53 -0400
committerAlex Shatov <alexs@att.com>2018-09-17 16:21:53 -0400
commitcb017456dbe09fc8f3e5270e641ab8f323ecde76 (patch)
treef62de1c4b25754700f0138785a9874db8170d83d /lib/utils.js
parentceda84d021dde70299f96984ca7aec16740854be (diff)
3.0.2 tls web-server under k8s3.0.2
- external version 3.0.2 - internal version 5.0.2 for code change - no API change - https server is enabled when either of the following pairs are found in fs: 1. etc/cert/cert and etc/cert/pass (old behavior) 2. etc/cert/cert.p12 and etc/cert/p12.pass - added alternative - hide secrets when logging the config - changed Dockerfile to copy the whole etc/ folder that might contain etc/cert/* files - easier to test - replaced CRLF with LF in swagger-ui.js - no code change - unit tested Coverage summary Statements : 77.45% ( 910/1175 ) Branches : 53.7% ( 283/527 ) Functions : 79.9% ( 159/199 ) Lines : 77.85% ( 900/1156 ) Change-Id: I921e0d6ac9573f60fa98910f799f9d034b573542 Signed-off-by: Alex Shatov <alexs@att.com> Issue-ID: DCAEGEN2-780
Diffstat (limited to 'lib/utils.js')
-rw-r--r--lib/utils.js19
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/utils.js b/lib/utils.js
index 70146e3..8caf280 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,16 +1,16 @@
/*
-Copyright(c) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
+Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
+Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied.
+CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the License.
*/
@@ -26,14 +26,19 @@ exports.hasProperty = function(o, key) {
if (typeof(o) === 'object' && o !== null && (e in o) && (typeof o[e] !== 'undefined')) {
o = o[e];
return true;
- }
+ }
else {
return false;
- }
+ }
});
};
/* Generate a random ID string */
exports.generateId = function() {
- return uuid();
+ return uuid();
+};
+
+const hide_fields = ["passphrase", "pfx"];
+exports.hideSecrets = function(key, value) {
+ return (key && hide_fields.includes(key) && "*") || value;
};