@vulkano/core 1.7.0 → 1.8.1

package/bootstrap/express.js

@@ -43,6 +43,7 @@ module.exports = function getExpressConfiguration() {
     cookies: {},
     csp: {},
     jwt: {},
+    session: {},
     permissionPolicy: {},
     sockets: {},
     redis: {},

package/bootstrap/server.js

@@ -15,6 +15,7 @@ const helmet = require('helmet');
 const timeout = require('connect-timeout');
 const useragent = require('express-useragent');
 const cookieParser = require('cookie-parser');
+const expressSession = require('express-session');
 const { createClient: socketRedis } = require('redis');
 const socketMongoose = require('mongoose');
 const { createAdapter: socketRedisAdapter } = require('@socket.io/redis-adapter');
@@ -86,12 +87,22 @@ module.exports = function loadServer() {
       // ---------------
       // COOKIES - File: app/config/express/cookies.js
       // ---------------
-      if (expressConfig.cookies && expressConfig.cookies.enabled) {
-        const cookiesSecretKey = COOKIES_SECRET_KEY || expressConfig.cookies.key || expressConfig.cookies.secret || '';
+      const {
+        enabled: cookiesEnabled
+      } = expressConfig.cookies || {};
+
+      let cookiesSecretKey = null;
+
+      if (cookiesEnabled) {
+
+        cookiesSecretKey = COOKIES_SECRET_KEY || expressConfig.cookies.key || expressConfig.cookies.secret || '';
+
         if (!cookiesSecretKey) {
           console.log(' \x1b[33mWARNING\x1b[0m: Set the secret key in the config/express/cookie.js file or COOKIES_SECRET_KEY in the .env file.');
         }
+
         vulkano.use(cookieParser(cookiesSecretKey));
+
       }
 
       // ---------------
@@ -232,6 +243,26 @@ module.exports = function loadServer() {
         });
       }
 
+      // ---------------
+      // Express Session  - File: app/config/express/session.js
+      // ---------------
+      const {
+        enabled: sessionEnabled
+      } = expressConfig.session || {};
+
+      if (sessionEnabled) {
+
+        if (!cookiesEnabled) {
+          console.log(' \x1b[41mERROR\x1b[0m: Can not load the Express Session because the Cookies aren\'t enabled');
+          return;
+        }
+
+        delete expressConfig.session.enabled;
+
+        vulkano.use(expressSession({ ...expressConfig.session, secret: cookiesSecretKey }));
+
+      }
+
       // ---------------
       // Content Security Policy  - File: app/config/express/csp.js
       // ---------------
@@ -241,14 +272,35 @@ module.exports = function loadServer() {
         rules: cspRules
       } = expressConfig.csp || {};
 
-      if (cspEnabled) {
+      if (cspEnabled && cspRules) {
+
+        const cspRulesHeader = [];
+
+        if (Array.isArray(cspRules) && cspRules.length > 0) {
+
+          for ( let i = 0; i < cspRules.length; i += 1) {
+            cspRulesHeader.push(cspRules[i]);
+          }
+
+        } else if (typeof cspRules === 'object') {
+
+          Object.keys(cspRules).forEach( (r) => {
+            const tmpValues = cspRules[r];
+            if (Array.isArray(tmpValues)) {
+              cspRulesHeader.push(`${r} ${tmpValues.join(' ')}`);
+            } else if (typeof tmpValues === 'string') {
+              cspRulesHeader.push(`${r} ${tmpValues}`);
+            }
+          });
+
+        } else if (typeof cspRules === 'string') {
+
+          cspRulesHeader.push(cspRules);
 
-        if (!Array.isArray(cspRules)) {
-          console.error('Vulkano Error: ', 'The Content Security Policy Rules must be an array');
-          return;
         }
 
-        if (cspRules.length > 0) {
+        // Has Rules
+        if (cspRulesHeader.length > 0) {
 
           vulkano.use( (req, res, next) => {
 
@@ -256,7 +308,7 @@ module.exports = function loadServer() {
               res.setHeader('Report-To', JSON.stringify(cspReportTo));
             }
 
-            res.setHeader('Content-Security-Policy', cspRules.join('; '));
+            res.setHeader('Content-Security-Policy', cspRulesHeader.join('; '));
 
             next();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vulkano/core",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "A MVC framework using Express 4",
   "license": "MIT",
   "author": "Vulkano Team",
@@ -41,6 +41,7 @@
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "express-jwt": "^8.4.1",
+    "express-session": "^1.18.0",
     "express-useragent": "^1.0.15",
     "frameguard": "^4.0.0",
     "fs": "^0.0.1-security",