gina 0.1.1-alpha.17 → 0.1.1-alpha.171

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.171}/core/server.js

@@ -15,7 +15,7 @@ const swig          = require( _(GINA_FRAMEWORK_DIR +'/node_modules/swig', true)
 var Config          = require('./config');
 var Router          = require('./router');
 var lib             = require('./../lib');
-var routingUtils    = lib.routing;
+var routingLib    = lib.routing;
 var inherits        = lib.inherits;
 var merge           = lib.merge;
 var Proc            = lib.Proc;
@@ -227,13 +227,56 @@ function Server(options) {
                 })
             });
         } catch (err) {
-            console.emerg(sslDetails +'\n'+ err.stack);
-            return;
+            if (!sslDetails) {
+                throw new Error('DNS issue ? Did you check your `/etc/hosts` or your DNS configuration ?\n'+ err.stack);
+            }
+            throw new Error(sslDetails +'\n'+ err.stack);
         }
 
 
         const failed  = !sslDetails.valid;
         const humanView = JSON.stringify(sslDetails, null, '  ');
+
+        // Wildcard exception - See https://github.com/dyaa/ssl-checker/issues/381
+        // Date of the test: 2022-12-18T00:00:00.000Z
+        // container-87546.dev.sample.app -> not valid when it should return true.
+        // {
+        //     "daysRemaining": 290,
+        //     "valid": false,
+        //     "validFrom": "2022-10-03T00:00:00.000Z",
+        //     "validTo": "2023-10-03T23:59:59.000Z",
+        //     "validFor": [
+        //         "*.sample.app",
+        //         "sample.app"
+        //     ]
+        // }
+
+        const isHandleByWildcardCert = function(endpoint, hv) {
+            var isAllowed = false;
+            const start = new Date(hv.validFrom).format('longIsoDateTime');
+            const end = new Date(hv.validTo).format('longIsoDateTime');
+            const today = new Date().format('longIsoDateTime');
+            const allowed = hv.validFor;
+
+            for (let i=0, len=allowed.length; i<len; ++i ) {
+                // skip if not a wildcard
+                if ( ! /^[*]\./.test(allowed[i]) ) continue;
+
+                let re = new RegExp( allowed[i].replace(/^[*]/, '')+'$' );
+                if ( ! re.test(endpoint) ) continue;
+
+                if ( today >= start && today < end) {
+                    isAllowed = true;
+                    break
+                }
+            }
+            return isAllowed;
+        }
+        if ( failed && Array.isArray(sslDetails.validFor) && isHandleByWildcardCert(endpoint, sslDetails) ) {
+            return;
+        }
+
+
         if (failed) {
             if (sslDetails.daysRemaining > -1) {
                 console.emerg(`[Certificate] ${endpoint} : It is like there is a problem with your CA certificate${'\n'} ${humanView}`);
@@ -1128,7 +1171,12 @@ function Server(options) {
 
             var headerValue = null;
             for (var h in resHeaders) {
-                if (!response.headersSent) {
+                if (
+                    // typeof(response.finished) != 'undefined' && !response.finished
+                    // || typeof(response.writableEnded) != 'undefined' && !response.writableEnded
+                    // ||
+                    !response.headersSent
+                ) {
                     // handles multiple origins
                     if ( /access\-control\-allow\-origin/i.test(h) ) { // re.test(resHeaders[h]
                         if (sameOrigin) {
@@ -1151,13 +1199,26 @@ function Server(options) {
                                 origin = sameOrigin;
 
 
-                            response.setHeader(h, origin);
+                            // if (
+                            //     typeof(response.finished) != 'undefined' && !response.finished
+                            //     || typeof(response.writableEnded) != 'undefined' && !response.writableEnded
+                            //     || !response.headersSent
+                            // ) {
+                                response.setHeader(h, origin);
+                            // }
+
                         }
                         sameOrigin = false;
                     } else {
                         headerValue = resHeaders[h];
                         try {
-                            response.setHeader(h, headerValue)
+                            // if (
+                            //     typeof(response.finished) != 'undefined' && !response.finished
+                            //     || typeof(response.writableEnded) != 'undefined' && !response.writableEnded
+                            //     || !response.headersSent
+                            // ) {
+                                response.setHeader(h, headerValue)
+                            // }
                         } catch (headerError) {
                             console.error(headerError)
                         }
@@ -1178,11 +1239,88 @@ function Server(options) {
     }
 
     this.onHttp2Stream = function(stream, headers, response) {
+        var header      = null
+            , isWebroot = false
+            , pathname  = null
+            , asset     = null
+            , assets    = this._options.template.assets
+            , conf      = this._options.conf
+            , cacheless = conf.cacheless
+        ;
+
+
+        if (
+            headers[':path'] == '/'
+            || headers[':path'] == this._options.conf.server.webroot
+        ) {
+
+            if (
+                this._options.conf.server.webroot != headers[':path']
+                && this._options.conf.server.webrootAutoredirect
+                || headers[':path'] == this._options.conf.server.webroot
+                    && this._options.conf.server.webrootAutoredirect
+            ) {
+                isWebroot = true
+            }
+        }
+
+        var url = (isWebroot) ? this._referrer : headers[':path'];
+
+        var hanlersPath     = conf.handlersPath
+            , isHandler     = ( new RegExp('^'+ hanlersPath).test(assets[ url ].filename) ) ? true: false
+        ;
 
         if (!stream.pushAllowed) {
-            //header = merge({ ':status': 200 }, response.getHeaders());
-            stream.respond({ ':status': 200 });
-            stream.end();
+            asset = {
+                url         : url,
+                filename    : assets[ url ].filename,
+                file        : null,
+                isAvailable : assets[ url ].isAvailable,
+                mime        : assets[ url ].mime,
+                encoding    : conf.encoding,
+                isBinary    : assets[ url ].isBinary,
+                isHandler   : assets[ url ].isHandler
+            };
+            header = merge({ ':status': 200 }, response.getHeaders());
+            header['content-type'] = ( !/charset/.test(asset.mime ) ) ? asset.mime + '; charset='+ asset.encoding : asset.mime;
+            header = completeHeaders(header, local.request, response);
+            if (asset.isBinary || asset.isHandler ) {
+
+
+                if (asset.isHandler) {
+                    // adding handler `gina.ready(...)` wrapper
+                    var file = null;
+                    if ( !fs.existsSync(asset.filename) ) {
+                        throwError({stream: stream}, 404, 'Page not found: \n' + headers[':path']);
+                        return;
+                    }
+
+                    if (!assets[ url ].file) {
+                        file      = fs.readFileSync(asset.filename, asset.encoding).toString();
+                        file      = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));';
+                        this._options.template.assets[ headers[':path'] ].file = file;
+                    } else {
+                        file = assets[ url ].file;
+                    }
+
+                    // header['content-length'] = fs.statSync(file).size;
+                    stream.respond(header);
+                    stream.end(file);
+
+                    return;
+                }
+
+                header['content-length'] = fs.statSync(asset.filename).size;
+                stream.respondWithFile(
+                    asset.filename
+                    , header
+                    //, { onError }
+                );
+            } else {
+                stream.respond(header);
+                stream.end();
+            }
+
             return;
         }
 
@@ -1193,18 +1331,18 @@ function Server(options) {
             return;
         }
 
-        var header = null, isWebroot = false, pathname = null;
         if (
-            headers[':path'] == '/'
-            || headers[':path'] == this._options.conf.server.webroot
+            // headers[':path'] == '/'
+            // || headers[':path'] == this._options.conf.server.webroot
+            /^true$/i.test(isWebroot)
         ) {
 
-            if (
-                this._options.conf.server.webroot != headers[':path']
-                && this._options.conf.server.webrootAutoredirect
-                || headers[':path'] == this._options.conf.server.webroot
-                    && this._options.conf.server.webrootAutoredirect
-            ) {
+            // if (
+            //     this._options.conf.server.webroot != headers[':path']
+            //     && this._options.conf.server.webrootAutoredirect
+            //     || headers[':path'] == this._options.conf.server.webroot
+            //         && this._options.conf.server.webrootAutoredirect
+            // ) {
 
                 header = {
                     ':status': 301
@@ -1220,9 +1358,10 @@ function Server(options) {
                 stream.respond(header);
                 stream.end();
                 return;
-            } else {
-                isWebroot = true;
-            }
+            // }
+            // else {
+            //     isWebroot = true;
+            // }
         }
 
         if (
@@ -1235,21 +1374,19 @@ function Server(options) {
             header = {
                 ':status': 200
             };
-            var url = (isWebroot) ? this._referrer : headers[':path'];
-            var assets = this._options.template.assets;
+            // var assets = this._options.template.assets;
+            // var url = (isWebroot) ? this._referrer : headers[':path'];
             var responseHeaders = ( typeof(this._responseHeaders) != 'undefined') ? this._responseHeaders : null;
-            var conf = this._options.conf;
-            var asset = {
-                    url         : url,
-                    filename    : assets[ url ].filename,
-                    file        : null,
-                    isAvailable : assets[ url ].isAvailable,
-                    mime        : assets[ url ].mime,
-                    encoding    : conf.encoding,
-                    isHandler   : false
-                }
-                , cacheless = conf.cacheless
-            ;
+            // var conf = this._options.conf;
+            asset = {
+                url         : url,
+                filename    : assets[ url ].filename,
+                file        : null,
+                isAvailable : assets[ url ].isAvailable,
+                mime        : assets[ url ].mime,
+                encoding    : conf.encoding,
+                isHandler   : isHandler
+            };
 
             console.debug('h2 pushing: '+ headers[':path'] + ' -> '+ asset.filename);
 
@@ -1261,7 +1398,7 @@ function Server(options) {
                     return;
                 }
 
-                asset.isHandler = true;
+                asset.isHandler = this._options.template.assets[ headers[':path'] ].isHandler  = true;
                 asset.file      = fs.readFileSync(asset.filename, asset.encoding).toString();
                 asset.file      = '(gina.ready(function onGinaReady($){\n'+ asset.file + '\n},window["originalContext"]));';
 
@@ -1287,6 +1424,9 @@ function Server(options) {
 
 
                 header['content-type'] = ( !/charset/.test(asset.mime ) ) ? asset.mime + '; charset='+ asset.encoding : asset.mime;
+                if (assets[ url ].isBinary) {
+                    header['content-length'] = fs.statSync(assets[ url ].filename).size;
+                }
 
                 if (cacheless) {
                     // source maps integration for javascript & css
@@ -1382,6 +1522,7 @@ function Server(options) {
         var isFilenameDir   = null
             , dirname       = null
             , isBinary      = null
+            , isHandler     = null
             , hanlersPath   = null
         ;
 
@@ -1458,17 +1599,24 @@ function Server(options) {
                 }
 
 
-                if (cacheless)
+                if (cacheless) {
                     delete require.cache[require.resolve(filename)];
+                }
 
-
+                if (response.headersSent) {
+                    // May be sent by http/2 push
+                    return
+                }
                 fs.readFile(filename, bundleConf.encoding, function onStaticFileRead(err, file) {
                     if (err) {
                         throwError(response, 404, 'Page not found: \n' + pathname, next);
                         return;
-                    } else if (!response.headersSent) {
+                    }
+
+                    if (!response.headersSent) {
 
-                        isBinary = true;
+                        isBinary    = true;
+                        isHandler   = false;
 
                         try {
                             contentType = getHead(response, filename);
@@ -1488,7 +1636,8 @@ function Server(options) {
                                 hanlersPath = bundleConf.handlersPath;
 
                                 if ( new RegExp('^'+ hanlersPath).test(filename) ) {
-                                    isBinary = false;
+                                    isBinary    = false;
+                                    isHandler   = true;
                                     file = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));'
                                 }
                             }
@@ -1513,7 +1662,9 @@ function Server(options) {
                                         isAvailable: true,
                                         mime: contentType,
                                         url: request.url,
-                                        filename: filename
+                                        filename: filename,
+                                        isBinary: isBinary,
+                                        isHandler: isHandler
                                     }
                                 }
 
@@ -1592,12 +1743,15 @@ function Server(options) {
                                                     isAvailable: (!/404\.html/.test(filename)) ? true : false,
                                                     mime: contentType,
                                                     url: request.url,
-                                                    filename: filename
+                                                    filename: filename,
+                                                    isBinary: isBinary,
+                                                    isHandler: isHandler
                                                 }
                                             }
 
                                             if (!fs.existsSync(filename)) return;
-                                            isBinary = ( /text\/html/i.test(contentType) ) ? false : true;
+                                            isBinary    = ( /text\/html/i.test(contentType) ) ? false : true;
+                                            isHandler   = ( new RegExp('^'+ bundleConf.handlersPath).test(filename) ) ? true : false;
                                             if ( isBinary ) {
                                                 // override
                                                 self._options.template.assets[request.url] = {
@@ -1605,7 +1759,19 @@ function Server(options) {
                                                     isAvailable: true,
                                                     mime: contentType,
                                                     url: request.url,
-                                                    filename: filename
+                                                    filename: filename,
+                                                    isBinary: isBinary,
+                                                    isHandler: isHandler
+                                                }
+                                            }
+
+                                            if ( isHandler ) {
+                                                // adding handler `gina.ready(...)` wrapper
+                                                var file = null;
+                                                if (!self._options.template.assets[request.url].file) {
+                                                    file      = fs.readFileSync(filename, bundleConf.encoding).toString();
+                                                    file      = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));';
+                                                    self._options.template.assets[request.url].file = file;
                                                 }
                                             }
                                             self.onHttp2Stream(stream, headers, response);
@@ -2155,16 +2321,16 @@ function Server(options) {
 
         });//EO this.instance
 
-
         self.instance.listen(self.conf[self.appName][self.env].server.port);//By Default 3100
         self.instance.timeout = (1000 * 300); // e.g.: 1000x60 => 60 sec
 
+
         self.emit('started', self.conf[self.appName][self.env], true);
     }
 
     var processRequestData = function(request, response, next) {
 
-        var bodyStr = null, obj = null;
+        var bodyStr = null, obj = null, exception = null;
         // to compare with /core/controller/controller.js -> getParams()
         switch( request.method.toLowerCase() ) {
             case 'post':
@@ -2194,6 +2360,11 @@ function Server(options) {
 
                             try {
                                 obj = parseBody(bodyStr);
+                                if ( !obj) {
+                                    exception = new Error('Could not convert POST::BODY_STRING to POST::OBJECT. Possible JSON error in `bodyStr`');
+                                    throwError(response, 500, exception, next);
+                                    return;
+                                }
                                 request.post = obj;
                                 isPostSet = true;
                             } catch (err) {
@@ -2226,7 +2397,8 @@ function Server(options) {
                     if (request.body.count() == 0 && typeof(request.query) != 'string' && request.query.count() > 0 ) {
                         request.body = request.query
                     }
-                    bodyStr = JSON.stringify(request.body);
+                    // 2023-01-31: fixed `request.body` might not be an `object`
+                    bodyStr = ( typeof(request.body) == 'object') ? JSON.stringify(request.body) : request.body;
                     // false & true case
                     if ( /(\"false\"|\"true\"|\"on\")/.test(bodyStr) )
                         bodyStr = bodyStr.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
@@ -2235,7 +2407,7 @@ function Server(options) {
                 }
 
                 try {
-                    if ( obj.count() > 0 ) {
+                    if ( typeof(obj) == 'object' && obj.count() > 0 ) {
                         // still need this to allow compatibility with express & connect middlewares
                         request.body = request.post = obj;
                     }
@@ -2430,7 +2602,7 @@ function Server(options) {
             } else {
                 console.warn('[ '+file+' ] extension: `'+s[2]+'` not supported by gina: `core/mime.types`. Replacing with `plain/text` ')
             }
-            return type || 'plain/text'
+            return type || 'plain/text'
         } catch (err) {
             console.error('Error while trying to getHead('+ file +') extention. Replacing with `plain/text` '+ err.stack);
             return 'plain/text'
@@ -2531,13 +2703,13 @@ function Server(options) {
         }
 
         expressMiddlewares[nextMiddleware._index](nextMiddleware._request, nextMiddleware._response, function onNextMiddleware(err, request, response) {
-            ++nextMiddleware._index;
 
             if (err) {
                 throwError(nextMiddleware._response, 500, (err.stack||err.message||err), nextMiddleware._next, nextMiddleware._nextAction);
                 return;
             }
 
+            ++nextMiddleware._index;
             if (request)
                 nextMiddleware._request  = request;
 
@@ -2632,7 +2804,7 @@ function Server(options) {
             , wroot             = null
         ;
 
-        //matched = routingUtils.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
+        //matched = routingLib.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
 
         req = checkPreflightRequest(req);
         var params      = {}
@@ -2657,9 +2829,10 @@ function Server(options) {
         }
         var isMethodAllowed = null, hostname = null;
         out:
-            for (var name in routing) {
-                if (typeof(routing[name]['param']) == 'undefined')
+            for (let name in routing) {
+                if ( typeof(routing[name]['param']) == 'undefined' ) {
                     break;
+                }
 
                 // updating hostname
                 // if (
@@ -2698,7 +2871,7 @@ function Server(options) {
 
                 //Parsing for the right url.
                 try {
-                    isRoute = await routingUtils.compareUrls(params, routing[name].url, req, res, next);
+                    isRoute = await routingLib.compareUrls(params, routing[name].url, req, res, next);
                 } catch (err) {
                     var msg = 'Internal server error.\nRule [ '+name+' ] needs your attention.\n';
                     // TODO - Refactor `ApiError`to handle the following param
@@ -2818,7 +2991,7 @@ function Server(options) {
         }
 
         if (!res.headersSent) {
-            res.headersSent = true;
+            // res.headersSent = true;
             local.request = checkPreflightRequest(local.request);
             // updated filter on controller.js : 2020/09/25
             //if (isXMLRequest || !withViews || !isUsingTemplate ) {
@@ -2937,7 +3110,7 @@ function Server(options) {
                     }
 
                     var eRule = 'custom-error-page@'+ self.appName;
-                    var routeObj = routingUtils.getRoute(eRule);
+                    var routeObj = routingLib.getRoute(eRule);
                     routeObj.rule = eRule;
                     routeObj.url = url;
                     routeObj.param.title = ( typeof(eData.title) != 'undefined' ) ? eData.title : 'Error ' + eData.status;

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.171}/core/template/boilerplate/bundle/config/settings.server.json

@@ -6,19 +6,19 @@
     * Default is `true`: set to false if you have describe a redirection rule from your `routing.json`
     */
     // "webrootAutoredirect": false,
-    
+
     /**
     * `template` settings
     * Default is `false`: will automatically be set to `true` when you add a view/template (`false` is right for APIs only)
     */
-    // "template": false 
-    
+    // "template": false,
+
     /**
     * `response` settings
     * This section is mostly used to setup CORS
     */
     // "response": {
-            // CORS settings sample
+    //        // CORS settings sample
     //     "header": {
     //         "access-control-allow-origin": "{bundle}@{project}, https://checkout.stripe.com",
     //         "access-control-allow-headers": "X-Requested-With", // To allow AJAX request

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.171}/core/template/boilerplate/bundle/config/templates.json

@@ -3,7 +3,7 @@
     // common definitions : will apply for all templates
     "_common": {
         // by default, or it will load `layout.html` if exists or `nolayout.html`(from the framework assets)
-        "layout": "{templatesPath}/html/layout/main.html",
+        "layout": "{templatesPath}/html/layouts/main.html",
         // means that the file name of the template is the same as the route name
         // You can override it through the routing.json
         "routeNameAsFilenameEnabled": true,
@@ -26,16 +26,16 @@
 
     "home": {
         // If you want to exclude all global css
-        //"stylesheetsExcluded": "*",        
+        //"stylesheetsExcluded": "*",
         // If you also want to get rid of `gina` definitions, use "**" while excluding
-        
+
         // local css - Will fetch from {bundle}/public
         "stylesheets": [
             {
                 "url": "/css/home.css"
             }
         ]
-        
+
         // If you want to exclude all global js
         //"javascriptsExcluded": "*"
     }

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.171}/core/template/boilerplate/bundle/controllers/controller.content.js

@@ -20,7 +20,7 @@ function {Bundle}ContentController() {
         var data = {
             msg: appConf.greeting
         };
-        
+
         self.renderJSON(data);
 
         // use this to render errors