gina 0.1.1-alpha.16 → 0.1.1-alpha.160

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/core/server.isaac.js

@@ -1,7 +1,7 @@
 //"use strict";
 /**
  * Isaac Server Integration
- * 
+ *
  */
 const fs                    = require('fs');
 const {EventEmitter}        = require('events');
@@ -16,10 +16,10 @@ const env     = process.env.NODE_ENV
     , isDev = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false;
 
 var refreshCore = function() {
-       
+
     var corePath    = getPath('gina').core;
     var libPath     = getPath('gina').lib;
-    
+
     var core        = new RegExp( corePath );
     var excluded    = [
         _(corePath + '/gna.js', true)
@@ -32,10 +32,10 @@ var refreshCore = function() {
     }
 
     //update lib & helpers
-    delete require.cache[require.resolve(_(libPath +'/index.js', true))];        
+    delete require.cache[require.resolve(_(libPath +'/index.js', true))];
     require.cache[_(libPath +'/index.js', true)] = require( _(libPath +'/index.js', true) );
     require.cache[_(corePath + '/gna.js', true)].exports.utils = require.cache[_(libPath +'/index.js', true)];
-    
+
     //update plugins
     delete require.cache[require.resolve(_(corePath +'/plugins/index.js', true))];
     require.cache[_(corePath +'/plugins/index.js', true)] = require( _(corePath +'/plugins/index.js', true) );
@@ -48,80 +48,89 @@ const slice = Array.prototype.slice;
 
 function ServerEngineClass(options) {
 
-    console.debug('[ ENGINE ] Isaac says hello !');    
-        
-    
+    console.debug('[ ENGINE ] Isaac says hello !');
+
+    // TOTO - See if it would be interesting to add it to Helper::Path & to extend it to also readdirSync, returning the directory content
+    var readSync = function(filename) {
+        var fileObj = new _(filename, true);
+        if ( fileObj.isSymlinkSync() ) {
+            filename = fileObj.getSymlinkSourceSync()
+        }
+
+        return fs.readFileSync(filename).toString()
+    }
+
     // openssl req -x509 -newkey rsa:2048 -nodes -sha256 -subj "/CN=localhost" -keyout localhost-privkey.pem -out localhost-cert.pem
     var credentials = {};
     if ( /https/.test(options.scheme) ) {
         try {
             credentials = {
-                key: fs.readFileSync(options.credentials.privateKey),
-                cert: fs.readFileSync(options.credentials.certificate)
+                key: readSync(options.credentials.privateKey),
+                cert: readSync(options.credentials.certificate)
             };
         } catch(err) {
             console.emerg('You are trying to start a secured server (https) wihtout suficient credentials: check your `server settings`\n'+ err.stack);
             process.exit(1)
         }
     }
-    
-    
+
+
     var allowHTTP1 = true; // by default
-    if (typeof (options.allowHTTP1) != 'undefined' && options.allowHTTP1 != '' ) {        
+    if (typeof (options.allowHTTP1) != 'undefined' && options.allowHTTP1 != '' ) {
         allowHTTP1 = options.allowHTTP1;
     }
     credentials.allowHTTP1 = allowHTTP1;
-        
-        
+
+
     if (typeof (options.credentials.ca) != 'undefined' && options.credentials.ca != '' )
         credentials.ca = options.credentials.ca;
 
     if (typeof (options.credentials.pfx) != 'undefined' && options.credentials.pfx != '' )
-        credentials.pfx = fs.readFileSync(options.credentials.pfx);
-        
+        credentials.pfx = readSync(options.credentials.pfx);
+
     if (typeof (options.credentials.passphrase) != 'undefined' && options.credentials.passphrase != '' )
         credentials.passphrase = options.credentials.passphrase;
-    
+
     var server = null, http = null, ioServer = null;
-            
+
     if ( /^http\/2/.test(options.protocol) ) {
         var http2   = require('http2');
         switch (options.scheme) {
-            case 'http':                
+            case 'http':
                 server      = http2.createServer({ allowHTTP1: allowHTTP1 });
                 break;
-                
-            case 'https':                
-                server      = http2.createSecureServer(credentials);                
+
+            case 'https':
+                server      = http2.createSecureServer(credentials);
                 break;
-        
+
             default:
                 server      = http2.createServer({ allowHTTP1: allowHTTP1 });
                 break;
         }
     } else {
-        
+
         switch (options.scheme) {
             case 'http':
                 http        = require('http');
                 server      = http.createServer();
                 break;
-                
+
             case 'https':
                 var https   = require('https');
                 server      = https.createServer(credentials);
                 break;
-        
+
             default:
                 http        = require('http');
                 server      = http.createServer();
                 break;
         }
     }
-    
-                    
+
+
     const middleware = function(path, cb) {
-        
+
         // if (request.path === path) {
         //     onPath.call(this, path, cb)
         // }  else { // 404
@@ -131,51 +140,51 @@ function ServerEngineClass(options) {
         //     });
         //     stream.end('<h1>404</h1>');
         // }
-    }  
-    
+    }
+
     if ( typeof(options.ioServer) != 'undefined' && typeof(options.ioServer.integrationMode) != 'undefined' && /^attach$/.test(options.ioServer.integrationMode) ) {
         console.info('[IO SERVER ] `eio` found using `'+ options.ioServer.integrationMode +'` integration mode');
         delete options.ioServer.integrationMode;
         // test done in case we would like to switch to socket.io-server
-        ioServer = ( typeof(Eio.attach) != 'undefined' ) ? new Eio.attach(server, options.ioServer) : new Eio(server, options.ioServer);        
-        
+        ioServer = ( typeof(Eio.attach) != 'undefined' ) ? new Eio.attach(server, options.ioServer) : new Eio(server, options.ioServer);
+
         ioServer.getClientsBySessionId = function(sessionId) {
-            
+
             if (this.clients.count() == 0)
                 return null;
-            
+
             var clients = null;
-            
+
             for (var id in this.clients) {
-                
+
                 if ( typeof(this.clients[id].sessionId) == 'undefined' )
                     continue;
-                
+
                 if (!clients) clients = {};
-                
+
                 clients[id] = this.clients[id];
             }
-            
+
             if (clients) {
                 // allowing to send for each client found sharing the same request session
                 clients.send = function(payload, option, callback) {
                     for ( var id in this) {
                         if ( typeof(this[id].sessionId) == 'undefined')
                             continue;
-                            
+
                         this[id].send(payload, option, callback)
                     }
                 }
             }
-                
-            
+
+
             return clients;
         }
-        
+
         server.eio = ioServer;
-        
+
         ioServer.on('connection', function (socket) {
-            
+
             socket.send(JSON.stringify({
                 id: this.id,//socket.id,
                 handshake: 'Welcomed to `'+ options.bundle +'` main socket !',
@@ -184,9 +193,9 @@ function ServerEngineClass(options) {
                 // how many ms without a pong packet to consider the connection closed
                 pingInterval: options.ioServer.pingInterval || options.ioServer.interval
             }));
-            
-            socket.on('message', function(payload){ 
-                
+
+            socket.on('message', function(payload){
+
                 try {
                     console.debug('[IO SERVER ] receiving '+ payload);
                     payload = JSON.parse(payload);
@@ -197,29 +206,29 @@ function ServerEngineClass(options) {
                 } catch(err) {
                     console.error(err.stack||err.message|| err)
                 }
-                
+
             });
-            
-            socket.on('close', function(){ 
+
+            socket.on('close', function(){
                 console.debug('[IO SERVER ] closed socket #'+ this.id);
             });
         });
-        
+
         server.on('upgrade', function(req, socket, head){
-            console.debug('[IO SERVER ] upgrading socket #'+ this.id);            
+            console.debug('[IO SERVER ] upgrading socket #'+ this.id);
             ioServer.handleUpgrade(req, socket, head);
         });
         // httpServer.on('request', function(req, res){
         //     ioServer.handleRequest(req, res);
         // });
-        
-        
+
+
     }
-    
-        
-    
+
+
+
     const onPath = function(path, cb, allowAll) {
-        
+
         var queryParams = null
             , i         = null
             , len       = null
@@ -227,37 +236,37 @@ function ServerEngineClass(options) {
             , arr       = null
             , a         = null
         ;
-          
+
         // http2stream handle by the Router class & the SuperController class
-        // See `${core}/router.js` & `${core}/controller/controller.js`    
-                
+        // See `${core}/router.js` & `${core}/controller/controller.js`
+
         server.on('request', (request, response) => {
-            
+
             if (isDev) {
                 refreshCore()
             }
-            
+
             if ( /engine.io/.test(request.url)) {
                 console.debug('io request');
             }
-                                      
+
             if (/^\*$/.test(path) || path == request.url) {
                 request.params  = {};
                 request.query   = {};
-                
+
                 if ( /\?/.test(request.url) ) {
-                    
+
                     queryParams = request.url.split(/\?/);
-                    
+
                     len = queryParams.length;
                     request.params[0] = queryParams[0];
-                    
+
                     if ( /\&/.test(queryParams[1]) ) {
-                        i = 1; 
+                        i = 1;
                         for (; i < len; ++i) {
-                            
+
                             arr = queryParams[i].split(/\&/);
-                            p = 0; 
+                            p = 0;
                             for (; p < arr.length; ++p) {
                                 a = arr[p].split(/\=/);
                                 // false & true case
@@ -265,7 +274,7 @@ function ServerEngineClass(options) {
                                     a[1] = ( /^(true|on)$/i.test(a[1]) ) ? true : false;
                                 else if (a[1].indexOf('%') > -1)
                                     a[1] = decodeURIComponent(a[1]);
-                                
+
                                 if (/^(\{|\[)/.test(a[1]) ) {
                                     try {
                                         a[1] = JSON.parse(a[1]);
@@ -273,94 +282,94 @@ function ServerEngineClass(options) {
                                         console.warn('[SERVER][INCOMING REQUEST]', 'Could not convert to JSON or Array this key/value to :' + a[0] + ': '+a[1] +'/nLeaving value as a string.');
                                     }
                                 }
-                                request.query[ a[0] ] = a[1] 
-                            }                        
-                        } 
+                                request.query[ a[0] ] = a[1]
+                            }
+                        }
                     } else {
                         a = queryParams[1].split(/\=/);
-                        
+
                         if (a.length > 1) {
                             // false & true case
                             if ( /^(false|true|on)$/i.test(a[1]) )
                                 a[1] = ( /^(true|on)$/i.test(a[1]) ) ? true : false;
-                            
-                            request.query[ a[0] ] = a[1]  
+
+                            request.query[ a[0] ] = a[1]
                         } else { // for redirection purposes or when passing `?encodedJsonObject`
                             try {
                                 if ( a[0].indexOf('%') > -1 ) { // encoded URI Component
                                     a[0] = decodeURIComponent(a[0])
                                 }
-                                
+
                                 request.query = JSON.parse(a[0]);
                             } catch(err) {
                                 console.error(err.stack)
                             }
-                        }                      
-                                                  
+                        }
+
                     }
-                    request.url = request.url.replace(/\?.*/, '')                  
+                    request.url = request.url.replace(/\?.*/, '')
                 } else {
                     request.params[0] = request.url
                 }
-                      
-                                
+
+
                 cb(request, response);
-            }            
-        });  
-        
+            }
+        });
+
     }
-    
+
 
     // All paths allowed
     server.all = function(path, cb) {
         onPath.call(this, path, cb, true)
     }
-    
+
     // configuring express plugins|middlewares
     server._expressMiddlewares = [];
     /**
      * <server>.use()
      * Applies middleware for every single route
-     * 
+     *
      * @param {function} fn
      */
     server.use = function use(fn) {
-             
+
         var offset = 0;
         //var path = '/';
-      
+
         // default path to '/'
         // disambiguate app.use([fn])
         if (typeof fn !== 'function') {
           var arg = fn;
-      
+
           while (Array.isArray(arg) && arg.length !== 0) {
             arg = arg[0];
           }
-      
+
           // first arg is the path
           if (typeof arg !== 'function') {
             offset = 1;
             path = fn;
           }
         }
-      
-        
+
+
         var fns = merge(slice.call(arguments, offset));
-      
+
         if (fns.length === 0) {
           throw new TypeError('server.use() requires a middleware function')
         }
-        
-        fns.forEach(function (fn) {            
+
+        fns.forEach(function (fn) {
             server._expressMiddlewares[server._expressMiddlewares.length] = fn;
         });
-        
+
         return this;
     }
-    
-    
-    
+
+
+
 
     server.on('error', (err) => {
         console.error(err)
@@ -374,8 +383,8 @@ function ServerEngineClass(options) {
     //     });
     //     stream.end('<h1>Hello World</h1>');
     // });
-    
-    
+
+
 
     return {
         instance: server,

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/core/server.js

@@ -234,6 +234,48 @@ function Server(options) {
 
         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}`);
@@ -2159,6 +2201,7 @@ function Server(options) {
         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);
     }
 
@@ -2531,13 +2574,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;
 

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/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.160/core/template/boilerplate/bundle_templates/html/content/homepage.html

@@ -0,0 +1,8 @@
+{% extends 'html/layouts/main.html' %}
+
+{% set data = page.data %}
+{% block content %}
+    <div class="content">
+        <h1>{{ data.msg }}</h1>
+    </div>
+{% endblock %}

package/framework/v0.1.1-alpha.160/core/template/boilerplate/bundle_templates/html/includes/error-msg-noscript.html

@@ -0,0 +1,11 @@
+<noscript>
+  <div class="wrap error-msg">
+    <a href="http://www.enable-javascript.com/fr/">
+      <p>Pour fonctionner correctement, ce site nécessite que JavaScript soit activé.</p>
+      <p>Tous les navigateurs récents supportent le Javascript, vous n’avez probablement besoin de changer qu’un réglage pour l’activer.</p>
+      <h2>
+        Comment activer Javascript dans votre navigateur&nbsp;?
+      </h2>
+    </a>
+  </div>
+</noscript>

package/framework/v0.1.1-alpha.160/core/template/boilerplate/bundle_templates/html/includes/error-msg-outdated-browser.html

@@ -0,0 +1,8 @@
+<!--[if lt IE 8]>
+  <div class="wrap error-msg">
+    <div>
+      <h2>Vous utilisez un navigateur <strong>non supporté</strong>.</h2>
+      <p>Pour pouvoir utiliser ce site <a href="http://browsehappy.com/">mettez votre navigateur à jour</a> ou <a href="http://www.google.com/chromeframe/?redirect=true">activez Google Chrome Frame</a>.</p>
+    </div>
+  </div>
+<![endif]-->

package/framework/{v0.1.1-alpha.16/core/template/boilerplate/bundle_templates/html/layout → v0.1.1-alpha.160/core/template/boilerplate/bundle_templates/html/layouts}/main.html

@@ -9,10 +9,17 @@
         <meta name="robots" content="index, follow, noarchive">
         <meta name="distribution" content="global">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        {{ page.view.stylesheets }}
-        {{ page.view.scripts }}
     </head>
     <body>
-        {{ page.content }}
+        <div class="outer-wrap">
+            <div class="content wrap">
+                {% include "./html/includes/error-msg-outdated-browser.html" %}
+                {% include "./html/includes/error-msg-noscript.html" %}
+
+                {% block content %}
+                    <p>If you view this message you didn’t define a <strong>content</strong> block in your template.</p>
+                {% endblock %}
+            </div>
+        </div>
     </body>
 </html>