gina 0.1.6-alpha.6 → 0.1.6-alpha.60

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/core/gna.js

@@ -212,10 +212,58 @@ gna.env = process.env.NODE_ENV = env;
 gna.scope = process.env.NODE_SCOPE = scope;
 gna.os.isWin32 = process.env.isWin32 = isWin32;
 gna.isAborting = false;
-//Cahceless is also defined in the main config : Config::isCacheless().
+//Cacheless is also defined in the main config : Config::isCacheless().
 process.env.NODE_ENV_IS_DEV = (/^true$/i.test(isDev)) ? true : false;
 process.env.NODE_SCOPE_IS_LOCAL = (/^true$/i.test(isLocalScope)) ? true : false;
 process.env.NODE_SCOPE_IS_PRODUCTION = (/^true$/i.test(isProductionScope)) ? true : false;
+// Proxy check
+var proxyPathObj    = new _(projects[projectName].path + '/proxy.json', true);
+var proxy           = null;
+if ( proxyPathObj.existsSync() ) {
+    try {
+        var proxyColl   = requireJSON(proxyPathObj.toString());
+        proxy       = new lib.Collection(proxyColl).findOne({ scope: process.env.NODE_SCOPE, env: process.env.NODE_ENV });
+        proxyColl   = null;
+    } catch (proxyErr) {
+        console.error('[ FRAMEWORK ][ configurationError ] ', proxyErr.stack || proxyErr.message || proxyErr);
+    }
+
+    if (proxy) {
+        gna.proxyHostname   = process.gina.PROXY_HOSTNAME    = proxy.hostname;
+        gna.proxyHost       = process.gina.PROXY_HOST        = proxy.hostname
+                                                                    .replace(/^(https|http)\:\/\//g, '')
+                                                                    .replace(/\:\d+\/$|\:\d+$/, '')
+        ;
+        var proxyPort = gna.proxyHostname.match(/\:\d+\/$|\:\d+$/) || null;
+        if (proxyPort) {
+            proxyPort = parseInt(proxyPort[0].match(/\d+/));
+        } else {
+            var foundScheme = gna.proxyHostname.match(/^(https|http)\:\/\//g)[0].replace(/\:\/\//g, '');
+            switch (foundScheme) {
+                case 'https':
+                    proxyPort = 443;
+                    break;
+                case 'ftp':
+                    proxyPort = 21;
+                    break;
+                case 'sftp':
+                    proxyPort = 22;
+                    break;
+                default:
+                    proxyPort = 80;
+                    break;
+            }
+            foundScheme = null;
+        }
+        gna.proxyPort       = process.gina.PROXY_PORT        = parseInt(proxyPort);
+
+        var isProxyHost = (
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+        // Forcing context - also available for workers
+        setContext('isProxyHost', isProxyHost);
+    }
+}
 
 
 var bundlesPath = (isDev) ? projects[projectName]['path'] + '/src' : projects[projectName]['path'] + '/bundles';
@@ -443,12 +491,16 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
     }
     var tmpPath = getPath('project') + '/tmp';
     console.debug('tmp path: ', tmpPath);
-    if ( !fs.existsSync(tmpPath) ) {
-        new _(tmpPath).mkdirSync();
+    var tmpPathObj = new _(tmpPath);
+    if ( !tmpPathObj.existsSync() ) {
+        tmpPathObj.mkdirSync();
     }
+    tmpPathObj = null;
+    var sourceObj = new _(source);
+    var targetObj = new _(target);
 
-    var isSourceFound   = fs.existsSync(source)
-        , isTargetFound = fs.existsSync(target)
+    var isSourceFound   = sourceObj.existsSync()
+        , isTargetFound = targetObj.existsSync()
     ;
     console.debug('[ FRAMEWORK ][ MOUNT ] Source: ', source);
     console.debug('[ FRAMEWORK ][ MOUNT ] Checking before mounting ', target, isTargetFound, bundlesPath);
@@ -475,6 +527,7 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
             if (!destinationObj.existsSync()) {
                 destinationObj.mkdirSync();
             }
+            console.debug('[ FRAMEWORK ][ MOUNT ] Linking ['+ srcPathObj.toString() +'] to [ '+ _(source) +' ] ');
             srcPathObj.symlinkSync(_(source));
             isSourceFound = true;
         }
@@ -485,15 +538,16 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
         gna.lib.generator.createPathSync(bundlesPath, function onPathCreated(err){
             if (!err) {
                 try {
-                    var targetObj = new _(target);
+                    // var targetObj = new _(target);
                     if ( targetObj.existsSync() ) {
                         targetObj.rmSync();
                     }
-                    if ( type != undefined)
+                    console.debug('[ FRAMEWORK ][ MOUNT ] Linking ['+ source +'] to [ '+ target +' ] ');
+                    if ( type != undefined) {
                         fs.symlinkSync(source, target, type)
-                    else
+                    } else {
                         fs.symlinkSync(source, target);
-
+                    }
                     // symlink created
                     callback(false);
 
@@ -544,6 +598,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
          * */
         gna.onInitialize = process.onInitialize = function(callback) {
 
+            console.debug('[ FRAMEWORK ] Bootstrap Initialization... ');
             gna.initialized = true;
             e.once('init', function(instance, middleware, conf) {
 
@@ -557,22 +612,20 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
                         joinContext(conf.contexts);
                         gna.getConfig = function(name){
-                            // var tmp = '';
+                            var tmp = null;
                             if ( typeof(name) != 'undefined' ) {
                                 try {
                                     //Protect it.
-                                    // tmp = JSON.stringify(conf.content[name]);
-                                    // return JSON.parse(tmp)
-                                    return JSON.clone(conf.content[name])
+                                    tmp = JSON.clone(conf.content[name])
                                 } catch (err) {
                                     console.error('[ FRAMEWORK ] ', err.stack);
                                     return undefined
                                 }
                             } else {
-                                // tmp = JSON.stringify(conf);
-                                // return JSON.parse(tmp)
-                                return JSON.clone(conf)
+                                //Protect it.
+                                tmp = JSON.clone(conf)
                             }
+                            return tmp
                         };
                         try {
                             //configureMiddleware(instance, express); // no, no and no...
@@ -876,6 +929,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                                     if (
                                         conf.server.scheme == 'https'
                                         && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
+                                        && !/^true$/i.test(isProxyHost)
                                     ) {
                                         try {
                                             await server.verifyCertificate(conf.host, conf.server.port);

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/core/model/index.js

@@ -54,8 +54,8 @@ function Model(namespace, _config) {
 
 
     var setup = function(namespace) {
-        if ( typeof(namespace) == 'undefined' || namespace == '') {
-            console.error('[ MODEL ][ '+ namespace +' ] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
+        if ( typeof(namespace) == 'undefined' || namespace == '') {
+            console.error('[MODEL]['+ namespace +'] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
         }
 
         var model, namespace = namespace.split(/\//g);
@@ -75,8 +75,8 @@ function Model(namespace, _config) {
         }
 
 
-        console.debug('[ MODEL ][ ' + model +' ] Bundle: '+ bundle);
-        //console.debug('[ MODEL ][ ' + model +' ] Model: '+ model);
+        console.debug('[MODEL][' + model +'] Bundle: '+ bundle);
+        //console.debug('[MODEL][' + model +'] Model: '+ model);
         self.name       = _connector;
         self.bundle     = bundle;
         self.model      = model;
@@ -115,29 +115,31 @@ function Model(namespace, _config) {
             _configuration = conf.connectors;
             self.connector = _configuration[self.name].connector;
 
-            console.debug('[ MODEL ][ ' + model +' ] About to scan: '+ conf.path);
+            console.debug('[MODEL][' + model +'] About to scan: '+ conf.path);
             //TODO - More controls...
 
             //For now, I just need the F..ing entity name.
             connectorPath       = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
             var modelPath       = local.modelPath = _(conf.path + '/' + modelDirName);
             var entitiesPath    = local.entitiesPath = _(modelPath + '/entities');
-            console.debug('[ MODEL ][ ' + model +' ] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
+            console.debug('[MODEL][' + model +'] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
             if (!fs.existsSync(entitiesPath)) {
                 //fs.mkdirSync(entitiesPath) // creating empty path
                 new _(entitiesPath).mkdirSync();
             }
 
             connectorPath   = _(connectorPath + '/lib/connector.js');
-            console.debug('[ MODEL ][ ' + model +' ] Loading connector: ' + connectorPath);
+            console.debug('[MODEL][' + model +'] Loading Connector: ' + connectorPath);
             //Getting Entities Manager.
             var exists = fs.existsSync(connectorPath);
             if (exists) {
-                if (cacheless)
+                if (cacheless) {
                     delete require.cache[require.resolve(_(connectorPath, true))];
+                }
 
+                console.debug('[MODEL][' + model +'] Using connector path: ' + _(connectorPath, true));
                 var Connector = require(_(connectorPath, true));
-
+                console.debug('[MODEL][' + model +'] Connecting ... ');
                 self.connect(
                     Connector,
                     function onConnect(err, conn) {
@@ -154,12 +156,12 @@ function Model(namespace, _config) {
             } else {//Means that no connector was found in models.
 
                 //finished.
-                self.emit('model#ready', new Error('[ MODEL ][ '+ model +' ] No connector found'), self.bundle, self.name, conn)
+                self.emit('model#ready', new Error('[MODEL]['+ model +'] No connector found'), self.bundle, self.name, conn)
             }
 
         } else {
-            console.warn('[ MODEL ][ ' + model +' ] no configuration found...');
-            self.emit('model#ready', new Error('[ MODEL ][ ' + model +' ] no configuration found for your model: ' + model), self.bundle, self.name, null)
+            console.warn('[MODEL][' + model +'] No configuration found...');
+            self.emit('model#ready', new Error('[MODEL][' + model +'] No configuration found for your model: ' + model), self.bundle, self.name, null)
         }
 
         return self
@@ -168,7 +170,7 @@ function Model(namespace, _config) {
 
     this.connect = function(Connector, callback) {
         if ( typeof(self.connectors[_connector]) == 'undefined' ) {
-            //console.debug('[ MODEL ] Need to create connector instance ...');
+            //console.debug('[MODEL] Need to create connector instance ...');
             self.connectors[_connector] = {};
             var connector = new Connector( self.getConfig(_connector) );
 
@@ -204,7 +206,10 @@ function Model(namespace, _config) {
         var i = i || 0;
 
         var configuration = null;
-        var env = null, conf = null, connectors = null;
+        var env             = null
+            , conf          = null
+            , connectors    = null
+        ;
         if ( typeof (_config) != 'undefined' ) {
             configuration = _config;
             env = _config.env;
@@ -215,21 +220,21 @@ function Model(namespace, _config) {
             env = configuration.Env.current;
             conf = configuration.Env.getConf(bundle, env);
         }
-        console.debug('[ MODEL ][ ' + _connector + ' ] env ', conf.env);
-        console.debug('[ MODEL ][ ' + _connector + ' ] configuration modelsPath ', conf.modelsPath);
-        console.debug('[ MODEL ][ ' + _connector + ' ] connectors ', connectors);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] env ', conf.env);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] configuration modelsPath ', conf.modelsPath);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] connectors ', connectors);
 
         // try {
 
         //     var locals = _locals = configLib.getSync('gina', 'locals.json')
         // } catch (err) {
-        //     console.emerg('[ MODEL ][ ' + _connector +' ] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
+        //     console.emerg('[MODEL][' + _connector +'] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
         //     if ( i < 10) {
-        //         console.debug('[ MODEL ][ ' + _connector +' ] about to retry to load locals.json');
+        //         console.debug('[MODEL][' + _connector +'] About to retry to load locals.json');
         //         setTimeout(function(){
 
         //             i = i+1;
-        //             console.debug('[ MODEL ][ ' + _connector +' ] retry ('+i+') ...');
+        //             console.debug('[MODEL][' + _connector +'] Retry ('+i+') ...');
         //             return getConfigSync(bundle, i)
         //         }, 300)
 
@@ -245,13 +250,12 @@ function Model(namespace, _config) {
             // configuration object.
             var confObj = {
                 connectors  : connectors,
-                path        : conf.modelsPath/**,
-                locals      : locals*/
+                path        : conf.modelsPath
             };
 
             return confObj
         } else {
-            throw new Error('[ MODEL ][ ' + _connector +' ] Config not instantiated');
+            throw new Error('[MODEL][' + _connector +'][getConfigSync] Config not instantiated');
             return undefined
         }
     }
@@ -277,7 +281,7 @@ function Model(namespace, _config) {
             // entities == null when the database server has not started.
             if ( err ) {
                 console.error(err.stack||err.message)
-                //console.log('No entities found for [ '+ self.name +':'+ entityName +'].\n 1) Check if the database is started.\n2) Check if exists: /models/entities/'+ entityName);
+                //console.debug('No entities found for ['+ self.name +':'+ entityName +'].\n 1) Check if the database is started.\n2) Check if exists: /models/entities/'+ entityName);
             }
             callback(err, bundle, model, conn)
         });

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/core/plugins/lib/validator/src/main.js

@@ -476,7 +476,7 @@
                 if ( typeof(liveCheckErrors[formId]) == 'undefined') {
                     liveCheckErrors[formId] = {};
                 }
-                if (errors.count() > 0) {
+                if (errors && errors.count() > 0) {
                     // reset field name
                     liveCheckErrors[formId][fieldName] = {};
                     // override
@@ -551,7 +551,10 @@
 
             if (!name) continue;
 
-            if ( typeof(errors[name]) != 'undefined' && !/(form\-item\-error|form\-item\-warning)/.test($parent.className) ) {
+            if (
+                errors
+                && typeof(errors[name]) != 'undefined' && !/(form\-item\-error|form\-item\-warning)/.test($parent.className)
+            ) {
 
                 if (isWarning) {
                     // adding warning class
@@ -592,7 +595,15 @@
 
 
 
-            } else if ( typeof(errors[name]) == 'undefined' && /(form\-item\-error|form\-item\-warning)/.test($parent.className) || typeof(errors[name]) != 'undefined' && errors[name].count() == 0 && /(form\-item\-error|form\-item\-warning)/.test($parent.className) ) {
+            } else if (
+                errors
+                    && typeof(errors[name]) == 'undefined'
+                    && /(form\-item\-error|form\-item\-warning)/.test($parent.className)
+                ||
+                errors
+                    && typeof(errors[name]) != 'undefined' && errors[name].count() == 0
+                    && /(form\-item\-error|form\-item\-warning)/.test($parent.className)
+            ) {
                 // reset when not in error
                 // remove child elements
                 var $children = $parent.getElementsByTagName('div');
@@ -606,7 +617,11 @@
 
                 $parent.className = $parent.className.replace(/(\s+form\-item\-error|form\-item\-error|\s+form\-item\-warning|form\-item\-warning)/, '');
 
-            } else if ( typeof(errors[name]) != 'undefined' && errAttr) {
+            } else if (
+                errors
+                && typeof(errors[name]) != 'undefined'
+                && errAttr
+            ) {
                 // refreshing already displayed error on msg update
                 var $divs = $parent.getElementsByTagName('div');
                 for (var d = 0, dLen = $divs.length; d<dLen; ++d) {
@@ -640,9 +655,9 @@
                     }
                 }
 
-                if ($err && $target.type != 'hidden')
+                if ($err && $target.type != 'hidden') {
                     insertAfter($target, $err);
-
+                }
             }
 
             if (typeof(fieldName) != 'undefined' && fieldName === $el.name) break;
@@ -1276,6 +1291,13 @@
                             // } else { // external - need to remove `X-Requested-With` from `options.headers`
                                 result.location = (!/^http/.test(result.location) && !/^\//.test(result.location) ) ? location.protocol +'//' + result.location : result.location;
                             //}
+                            // isProxyHost ?
+                            if (
+                                result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:\/\//, '').split(/\//g)[0] == gina.config.hostname
+                                && gina.config.hostname == window.location.host
+                            ) {
+                                result.location = location.protocol  + result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:/, '')
+                            }
 
                             return setTimeout(() => {
                                 window.location.href = result.location;
@@ -3180,6 +3202,10 @@
 
                                     updateSubmitTriggerState( $gForm, isFormValid);
 
+                                    if ( !isFormValid && gResult.error ) {
+                                        instance.$forms[ $el.form.getAttribute('id') ].errors = gResult.error;
+                                    }
+
                                     once = false;
                                 })
 
@@ -6408,7 +6434,7 @@
 
                     for (var c in rules) {
                         if (!/^\_case\_/.test(c) ) continue;
-                        if ( typeof(rules[c].conditions) == 'undefined' || Array.isArray(rules[c].conditions) && !rules[c].conditions.length ) continue;
+                        if ( typeof(rules[c].conditions) == 'undefined' || Array.isArray(rules[c].conditions) && !rules[c].conditions.length ) continue;
                         if ( typeof(rules[c].conditions[0].rules) == 'undefined' ) continue;
 
 
@@ -6590,7 +6616,14 @@
                             // filtering conditions
                             for (var _c = 0, _cLen = rules[c].conditions.length; _c < _cLen; ++_c) {
 
-                                if (rules[c].conditions[_c].case != caseValue) {
+                                if (
+                                    Array.isArray(rules[c].conditions[_c].case)
+                                        && rules[c].conditions[_c].case.indexOf(caseValue) == -1
+                                    ||
+                                    !Array.isArray(rules[c].conditions[_c].case)
+                                        && rules[c].conditions[_c].case != caseValue
+
+                                ) {
                                     continue;
                                 }
 
@@ -6735,7 +6768,8 @@
                             if (
                                 conditions[c]['case'] === caseValue
                                 ||
-                                Array.isArray(conditions[c]['case']) && conditions[c]['case'].indexOf(caseValue) > -1
+                                Array.isArray(conditions[c]['case'])
+                                    && conditions[c]['case'].indexOf(caseValue) > -1
                                 ||
                                 /^\//.test(conditions[c]['case'])
                             ) {

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/core/router.js

@@ -118,6 +118,73 @@ function Router(env, scope) {
         // }
         // return ;
 
+
+       var serverInstance   = self.getServerInstance();
+       var config               = null
+            , conf              = null
+            , bundle            = null
+            , env               = null
+            , scope             = null
+            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+       ;
+        try {
+            config      = new Config().getInstance();
+            if (!params.bundle) {
+                try {
+                    //params.bundle = config.bundle;
+                    //params.param = config.routing[config.reverseRouting[params.param.url]];
+                    var _rule = config.reverseRouting[params.param.url];
+                    params = merge(params, config.routing[_rule]);
+                    params.rule = _rule;
+                } catch(reverseRoutingError) {
+                    serverInstance.throwError(response, 500, reverseRoutingError);
+                    return;
+                }
+            }
+            bundle      = local.bundle = params.bundle;
+            env         = config.env;
+            scope       = config.scope;
+            conf        = config[bundle][env];
+        } catch (configErr) {
+            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
+            return;
+        }
+
+        local.cacheless     = cacheless;
+        local.request       = request;
+        local.next          = next;
+        local.conf          = conf;
+        local.isStandalone  = conf.isStandalone;
+
+
+        /**
+         * Reverse proxy check
+         */
+        var requestPort = request.headers.port || request.headers[':port'];
+        var isProxyHost = (
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            &&  /^(80|443)$/.test(requestPort)
+            && conf.server.scheme +'://'+ request.headers.host +':'+ requestPort != conf.hostname.replace(/\:\d+$/, '') +':'+ conf.server.port
+            ||
+            typeof(request.headers[':authority']) != 'undefined'
+            && conf.server.scheme +'://'+ request.headers[':authority'] != conf.hostname
+            ||
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            && /^(80|443)$/.test(requestPort)
+            && request.headers.host == conf.host
+            ||
+            typeof(request.headers['x-nginx-proxy']) != 'undefined'
+            && /^true$/i.test(request.headers['x-nginx-proxy'])
+            ||
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+
+        setContext('isProxyHost', isProxyHost);
+
+
+
         /**
         * ExpressJS modules + HTTP2 fix
         * Hack required until `express-<plugin>` get support for http2 `express-session`
@@ -140,6 +207,9 @@ function Router(env, scope) {
             ||
             typeof(request.session) != 'undefined'
             && typeof(request.isAuthenticated) == 'undefined'
+            ||
+            typeof(request.session) != 'undefined'
+            && typeof(request.session.passport) != 'undefined'
        ) {
             request.isAuthenticated = function() {
                 var property = 'user';
@@ -284,42 +354,6 @@ function Router(env, scope) {
         * EO Passport JS HTTP2 fix
         */
 
-       var serverInstance   = self.getServerInstance();
-       var config               = null
-            , conf              = null
-            , bundle            = null
-            , env               = null
-            , scope             = null
-            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
-       ;
-        try {
-            config      = new Config().getInstance();
-            if (!params.bundle) {
-                try {
-                    //params.bundle = config.bundle;
-                    //params.param = config.routing[config.reverseRouting[params.param.url]];
-                    var _rule = config.reverseRouting[params.param.url];
-                    params = merge(params, config.routing[_rule]);
-                    params.rule = _rule;
-                } catch(reverseRoutingError) {
-                    serverInstance.throwError(response, 500, reverseRoutingError);
-                    return;
-                }
-            }
-            bundle      = local.bundle = params.bundle;
-            env         = config.env;
-            scope       = config.scope;
-            conf        = config[bundle][env];
-        } catch (configErr) {
-            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
-            return;
-        }
-
-        local.cacheless     = cacheless;
-        local.request       = request;
-        local.next          = next;
-        local.conf          = conf;
-        local.isStandalone  = conf.isStandalone;
 
         if (cacheless) {
             refreshCoreDependencies();
@@ -416,10 +450,10 @@ function Router(env, scope) {
             rootPath        : conf.executionPath || null,
             executionPath   : conf.executionPath || null,
             //instance: self.serverInstance,
-            isUsingTemplate: local.isUsingTemplate,
-            cacheless: cacheless,
-            path: params.param.path || null, // user custom path : namespace should be ignored or left blank
-            assets: {}
+            isUsingTemplate : local.isUsingTemplate,
+            cacheless       : cacheless,
+            path            : params.param.path || null, // user custom path : namespace should be ignored or left blank
+            assets          : {}
         };
 
         if (routeHasViews) {

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/core/server.js

@@ -4,7 +4,8 @@ const fs            = require('fs');
 const os            = require('os');
 const path          = require('path');
 const EventEmitter  = require('events').EventEmitter;
-const Busboy        = require('./deps/busboy');
+// const Busboy        = require('./deps/busboy-0.2.14');
+const Busboy        = require('./deps/busboy-1.6.0');
 const Stream        = require('stream');
 const zlib          = require('zlib'); // gzip / deflate
 const util          = require('util');
@@ -21,6 +22,8 @@ var merge           = lib.merge;
 var Proc            = lib.Proc;
 var console         = lib.logger;
 var SwigFilters     = lib.SwigFilters;
+var Domain          = lib.Domain;
+var domainLib       = new Domain();
 
 function Server(options) {
 
@@ -293,6 +296,24 @@ function Server(options) {
 
         if (failed) {
             if (sslDetails.daysRemaining > -1) {
+                var isProxyHost = getContext('isProxyHost');
+                if ( /^true$/i.test(isProxyHost) ) {
+                    console.warn("Host is behind a reverse proxy, skipping server.verifyCertificate(...) ");
+                    return;
+                }
+                var rootDomain = domainLib.getRootDomain(endpoint).value;
+                hasMatchedEntry = false;
+                for (let i in sslDetails.validFor) {
+                    if ( new RegExp(sslDetails.validFor[i].replace(/^\*\./, '') + '$').test(rootDomain) ) {
+                        hasMatchedEntry = true;
+                        break;
+                    }
+                }
+                if (!hasMatchedEntry) {
+                    console.warn(`[Certificate] "${endpoint}" : Root domain not matching your certificate. If you plan to run your service behind a revese proxy, please do not forget to add "proxy.json" at the root of your project while going to production.${'\n'} ${humanView}`);
+                    return;
+                }
+                // sslDetails.validFor
                 console.emerg(`[Certificate] ${endpoint} : It is like there is a problem with your CA certificate${'\n'} ${humanView}`);
                 return;
             }
@@ -1035,8 +1056,8 @@ function Server(options) {
                     return name
                 }
 
-                var env     = self.conf.env
-                    , scope = self.conf.scope
+                var env     = self.conf.env || self.env
+                    , scope = self.conf.scope || self.scope
                 ;
 
                 for (let i=0, len=matched.length; i<len; ++i) {
@@ -1054,6 +1075,9 @@ function Server(options) {
                         project = arr[0];
                         env     = (arr[1]) ? arr[1] : env;
                     }
+                    if ( typeof(self.conf[bundle]) == 'undefined' ) {
+                        continue;
+                    }
                     scheme  = self.conf[bundle][env].server.scheme;
                     hostname  = ( !self.conf[bundle][env].hostname ) ? self.conf[bundle][env].server.scheme + '://' + self.conf[bundle][env].host + ':' + self.conf[bundle][env].server.port : self.conf[bundle][env].hostname;
                     name    = name.replace(oldHost, hostname);
@@ -1417,7 +1441,6 @@ function Server(options) {
                 var key = pathname.replace(pathname.split('/').splice(-1), '');
                 for ( ; s < sLen; ++s ) {
                     if ( bundleConf.staticResources[s] == key ) {
-                    // if ( eval('/^' + bundleConf.staticResources[s].replace(/\//g,'\\/') +'/').test(pathname) ) {
                         filename = bundleConf.content.statics[ bundleConf.staticResources[s] ] +'/'+ pathname.replace(bundleConf.staticResources[s], '');
                         break;
                     }
@@ -2067,11 +2090,14 @@ function Server(options) {
                         'method': 'POST',
                         'bundle' : self.appName
                     };
-                    var busboy = new Busboy({ headers: request.headers });
+                    var busboy = Busboy({ headers: request.headers });
 
                     // busboy.on('field', function(fieldname, val, fieldnameTruncated, valTruncated) {
                     //     console.log('Field [' + fieldname + ']: value: ' + inspect(val));
                     // });
+
+                    // Attention: on busboy upgrade, we needs to adapt `busboy/lib/types/multipart.js`
+                    // For this, check the emit method
                     busboy.on('file', function(fieldname, file, filename, encoding, mimetype, group) {
 
                         file._dataLen = 0;