summaryrefslogtreecommitdiffstats
path: root/admportal/shell/www
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-04-12 10:00:20 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-04-12 10:13:41 -0400
commitb685bb6748b7916f8b63cfe88e5b48282eb13815 (patch)
treee666dec3c7924bebd727b9363ae173fcfc7daa3f /admportal/shell/www
parent36e5592035ddb983892ccb63faeb29e455bbb76b (diff)
Handle case where sslcert file is not specified
If ssl cert file is not specified, do not enable SSL. Current script does not explicitly check and so crashes if https port is specified and ssl cert file is not. Change-Id: I3e72444302e1c499e1efd6ad6938c8d7b9aaa9c1 Issue-ID: SDNC-727 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Former-commit-id: 43d2b9ad3edc462b79213faac4ab32f448ebf75c
Diffstat (limited to 'admportal/shell/www')
-rwxr-xr-xadmportal/shell/www5
1 files changed, 3 insertions, 2 deletions
diff --git a/admportal/shell/www b/admportal/shell/www
index 5c639e8f..ef5dcae5 100755
--- a/admportal/shell/www
+++ b/admportal/shell/www
@@ -12,6 +12,7 @@ var https = require('https');
var http_port = properties.nonSslPort;
var https_port = properties.ConexusNetworkPort;
var cert_pswd = process.env.CERT_PSWD;
+var sslCert = properties.ConexusNetwork_sslCert;
if (typeof http_port != 'undefined' && http_port.length > 0)
{
@@ -23,10 +24,10 @@ if (typeof http_port != 'undefined' && http_port.length > 0)
});
}
-if (typeof https_port != 'undefined' && https_port.length > 0)
+if (typeof https_port != 'undefined' && https_port.length > 0 && sslCert.length > 0)
{
var sslOptions = {
- pfx: fs.readFileSync(properties.ConexusNetwork_sslCert),
+ pfx: fs.readFileSync(sslCert),
passphrase: properties.ConexusNetwork_sslKey,
secureOptions: constants.SSL_OP_NO_TLSv1|constants.SSL_OP_NO_SSLv2|constants.SSL_OP_NO_SSLv3,
ciphers: [ "AES128-GCM-SHA256","!RC4","HIGH","!MD5","!aNULL","!EDH","!3DES" ].join(':'),