@sassoftware/viya-serverjs 0.2.1 → 0.2.2

package/Dockerfile

@@ -31,8 +31,8 @@ ENV HAPIDEBUG=NO
 ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost"
 
 # You can specify your own cet and key
-# ENV TLS_CERT=../../../certs/cert64.cer
-# ENV TLS_KEY=../../../certs/pubkey64.pem
+ENV TLS_CRT=./tls/tls.crt
+ENV TLS_KEY=./tls/tls.key
 
 # Samesite specification
 ENV SAMESITE=None,secure

package/lib/iService.js

@@ -314,81 +314,32 @@ function _getCertificates() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           tls = {};
-          debug2('Getting tls certificates');
-          debug2('tls.crt', process.env['tls.crt'] != null);
-          debug2('tls.key', process.env['tls.key'] != null);
-          debug2('TLS_PFX', process.env.TLS_PFX != null);
-          debug2('TLS_PW', process.env.TLS_PW != null);
-          debug2('TLS_CERT', process.env.TLS_CERT != null);
           debug2('TLS_CRT', process.env.TLS_CRT != null);
           debug2('TLS_CREATE', process.env.TLS_CREATE != null);
-          if (!(process.env.TLS_CERT != null && process.env.TLS_CERT.length > 0)) {
-            _context2.next = 15;
-            break;
-          }
-          /* backward compatability */
-          debug2('TLS set: TLS_CERT');
-          tls.cert = fs.readFileSync(process.env.TLS_CERT);
-          tls.key = fs.readFileSync(process.env.TLS_KEY);
-          _context2.next = 37;
-          break;
-        case 15:
-          if (!(process.env.TLS_PFX != null)) {
-            _context2.next = 21;
-            break;
-          }
-          debug2('TLS set: PFX');
-          tls.pfx = fs.readFileSync(process.env.TLS_PFX);
-          if (process.env.TLS_PW != null) {
-            tls.passphrase = process.env.TLS_PW;
-          }
-          _context2.next = 37;
-          break;
-        case 21:
-          if (!(process.env.TLS_CRT != null && process.env.TLS_CRT.trim().length > 0)) {
-            _context2.next = 27;
-            break;
-          }
-          /* new key names to conform to k8s*/
-          debug2('TLS set: TLS_CRT');
-          tls.cert = process.env.TLS_CRT;
-          tls.key = process.env.TLS_KEY;
-          _context2.next = 37;
-          break;
-        case 27:
-          if (!(process.env['tls.crt'] != null)) {
-            _context2.next = 32;
-            break;
+          if (process.env.TLS_CRT != null && process.env.TLS_CRT.length > 0) {
+            if (fs.existsSync(process.env.TLS_CRT) && fs.existsSync(process.env.TLS_KEY)) {
+              console.log('TLS_CRT and TLS_KEY exist');
+              tls.cert = fs.readFileSync(process.env.TLS_CRT);
+              tls.key = fs.readFileSync(process.env.TLS_KEY);
+            }
           }
-          tls.cert = process.env['tls.crt'];
-          tls.key = process.env['tls.key'];
-          _context2.next = 37;
-          break;
-        case 32:
-          if (!(process.env.TLS_CREATE != null)) {
-            _context2.next = 37;
+          if (!(tls.cert == null && process.env.TLS_CREATE != null)) {
+            _context2.next = 10;
             break;
           }
           /* unsigned certificate */
+          console.log('Creating selfsigned certificate');
           debug2('TLS set: TLS_CREATE=', process.env.TLS_CREATE);
-          _context2.next = 36;
+          _context2.next = 9;
           return getTls();
-        case 36:
+        case 9:
           tls = _context2.sent;
-        case 37:
-          if (process.env.TLS_CABUNDLE != null) {
-            tls.CA = fs.readFileSync(process.env.TLS_CABUNDLE);
+        case 10:
+          if (Object.keys(tls).length === 0) {
+            console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
           }
-          debug2('TLS', tls);
-          if (!(Object.keys(tls).length > 0)) {
-            _context2.next = 43;
-            break;
-          }
-          return _context2.abrupt("return", tls);
-        case 43:
-          console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
           return _context2.abrupt("return", tls);
-        case 45:
+        case 12:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",

package/src/iService.js

@@ -259,49 +259,26 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 async function getCertificates () {
 
 	let tls = {};
-	debug2('Getting tls certificates');
-	debug2('tls.crt', process.env['tls.crt'] != null);
-	debug2('tls.key', process.env['tls.key'] != null);
-	debug2('TLS_PFX', process.env.TLS_PFX != null);
-	debug2('TLS_PW', process.env.TLS_PW != null);
-	debug2('TLS_CERT', process.env.TLS_CERT != null);
 	debug2('TLS_CRT', process.env.TLS_CRT != null);
 	debug2('TLS_CREATE', process.env.TLS_CREATE != null);
-	if (process.env.TLS_CERT != null && process.env.TLS_CERT.length > 0) {
-		/* backward compatability */
-		debug2('TLS set: TLS_CERT');
-		tls.cert = fs.readFileSync(process.env.TLS_CERT);
-		tls.key = fs.readFileSync(process.env.TLS_KEY);
-	} else if (process.env.TLS_PFX != null) {
-		debug2('TLS set: PFX');
-		tls.pfx = fs.readFileSync(process.env.TLS_PFX);
-		if (process.env.TLS_PW != null) {
-			tls.passphrase = process.env.TLS_PW;
+	if (process.env.TLS_CRT != null && process.env.TLS_CRT.length > 0) {
+		if (fs.existsSync(process.env.TLS_CRT) && fs.existsSync(process.env.TLS_KEY)) {
+			console.log('TLS_CRT and TLS_KEY exist');
+			tls.cert = fs.readFileSync(process.env.TLS_CRT);
+			tls.key = fs.readFileSync(process.env.TLS_KEY);
 		}
-	} else if (process.env.TLS_CRT != null && process.env.TLS_CRT.trim().length > 0) {
-		/* new key names to conform to k8s*/
-		debug2('TLS set: TLS_CRT');
-		tls.cert = process.env.TLS_CRT;
-		tls.key = process.env.TLS_KEY;
-	} else if (process.env['tls.crt'] != null) {
-		tls.cert = process.env['tls.crt'];
-		tls.key = process.env['tls.key'];
-	} else if (process.env.TLS_CREATE != null) {
+
+	} 
+	if (tls.cert == null && process.env.TLS_CREATE != null) {
 		/* unsigned certificate */
+		console.log('Creating selfsigned certificate');
 		debug2('TLS set: TLS_CREATE=', process.env.TLS_CREATE);
 		tls = await getTls();
 	}
-
-	if (process.env.TLS_CABUNDLE != null) {
-		tls.CA = fs.readFileSync(process.env.TLS_CABUNDLE);
-	}
-	debug2('TLS', tls);
-	if (Object.keys(tls).length > 0) {
-		return tls;
-	} else {
+	if (Object.keys(tls).length === 0){
 		console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
-		return tls;
-	}
+  }
+return tls;
 }
 
 async function getTls () {