From cb017456dbe09fc8f3e5270e641ab8f323ecde76 Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Mon, 17 Sep 2018 16:21:53 -0400 Subject: 3.0.2 tls web-server under k8s - 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 Issue-ID: DCAEGEN2-780 --- lib/utils.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'lib/utils.js') 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; }; -- cgit 1.2.3-korg