gina 0.1.6-alpha.4 → 0.1.6-alpha.41

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

@@ -1276,6 +1276,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;

package/framework/{v0.1.6-alpha.4 → v0.1.6-alpha.41}/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.4 → v0.1.6-alpha.41}/core/server.js

@@ -21,6 +21,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 +295,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 +1055,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 +1074,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);

package/framework/{v0.1.6-alpha.4 → v0.1.6-alpha.41}/helpers/path.js

@@ -423,7 +423,9 @@ function PathHelper() {
                 fs.mkdirSync(path, permission);
                 mkdirSync(self, permission, pathArr, i, path)
             } catch (err) {
-                console.debug(err.stack); // always keep trace of the original stack
+                if ( typeof(console.debug) != 'undefined' ) {
+                    console.debug(err.stack); // always keep trace of the original stack
+                }
                 throw new Error(err.message)
             }
         };
@@ -479,7 +481,7 @@ function PathHelper() {
                             if (p == path  && typeof(callback) != 'undefined' && typeof(self.created) == 'undefined' ) {
                                 if (typeof(callback) != 'undefined') {
                                     callback(err, path)
-                                } else {
+                                } else if ( typeof(console.debug) != 'undefined' ) {
                                     console.debug("no callback defined for mkdir ", path)
                                 }
                             }
@@ -881,7 +883,9 @@ function PathHelper() {
                     if (err) {
                         console.error(err.stack)
                     }
-                    console.debug('cp() completed copy to: ', method);
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug('cp() completed copy to: ', method);
+                    }
                     callback(err, destination, method)
                 })
             }
@@ -1163,10 +1167,14 @@ function PathHelper() {
     }
 
     var mv = function(self, target) {
-        console.debug("starting mv/copy from ", self.value, " to ", target);
+        if ( typeof(console.debug) != 'undefined' ) {
+            console.debug("starting mv/copy from ", self.value, " to ", target);
+        }
         cp(self.value, target)
             .onComplete(function onCpMv(err) {
-                console.debug("cp done... now unlinking source ", self.value);
+                if ( typeof(console.debug) != 'undefined' ) {
+                    console.debug("cp done... now unlinking source ", self.value);
+                }
                 if (err) {
                     e.emit('mv#complete', err);
                     return;
@@ -1174,7 +1182,9 @@ function PathHelper() {
 
 
                 rm(self.value).onComplete( function(err, path){
-                    console.debug('rm() complete');
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug('rm() complete');
+                    }
                     e.emit('mv#complete', err, path)
                 })
             })
@@ -1237,7 +1247,9 @@ function PathHelper() {
                     ++l;
                     removeFoldersSync(list, l, i)
                 } catch(err) {
-                    console.debug(err.stack); // always keep trace of the original stack
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug(err.stack); // always keep trace of the original stack
+                    }
                     throw new Error(err.message)
                 }
             } else {
@@ -1246,7 +1258,9 @@ function PathHelper() {
                     fs.rmdirSync(list[l][i]);
                     removeFoldersSync(list, l, i)
                 } catch(err) {
-                    console.debug(err.stack); // always keep trace of the original stack
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug(err.stack); // always keep trace of the original stack
+                    }
                     throw new Error(err.message)
                 }
             }
@@ -1257,7 +1271,9 @@ function PathHelper() {
         try {
             fs.unlinkSync(filename)
         } catch (err) {
-            console.debug(err.stack); // always keep trace of the original stack
+            if ( typeof(console.debug) != 'undefined' ) {
+                console.debug(err.stack); // always keep trace of the original stack
+            }
             throw new Error(err.message)
         }
     }

package/framework/{v0.1.6-alpha.4 → v0.1.6-alpha.41}/lib/cmd/bundle/add.js

@@ -368,7 +368,8 @@ function Add(opt, cmd) {
                 content[local.bundle] = {}
             }
             content[local.bundle][ self.envs[e] ] = {
-                "host" : local.bundle + "-{env}-{scope}-v{projectVersionMajor}.{rootDomain}"
+                "host_if_dns_resolution" : "{rootDomain}",
+                "host" : "localhost"
             };
 
         }

package/framework/{v0.1.6-alpha.4 → v0.1.6-alpha.41}/lib/cmd/framework/build.js

@@ -21,7 +21,7 @@ function Build(opt, cmd){
     var self    = {};
 
     var init = function(opt, cmd) {
-        console.debug('Building framework...');
+        console.log('Building framework, please wait ...');
 
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });

package/framework/{v0.1.6-alpha.4 → v0.1.6-alpha.41}/lib/cmd/helper.js

@@ -547,7 +547,13 @@ function CmdHelper(cmd, client, debug) {
             cmd.projectBundlesPath = projectBundlesPathObj.toString();
             // bundles symlink
             var bundlesLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/bundles', true);
-            if ( bundlesLinkPathObj.existsSync() && !bundlesLinkPathObj.isSymlinkSync() ) {
+            if (
+                bundlesLinkPathObj.existsSync()
+                && !bundlesLinkPathObj.isSymlinkSync()
+                ||
+                bundlesLinkPathObj.existsSync()
+                && fs.readlinkSync(bundlesLinkPathObj.toString()) != cmd.projectBundlesPath
+            ) {
                 bundlesLinkPathObj.rmSync();
             }
             if (!bundlesLinkPathObj.existsSync()) {
@@ -563,7 +569,13 @@ function CmdHelper(cmd, client, debug) {
             cmd.projectReleasesPath = projectReleasesPathObj.toString();
             // releases symlink
             var releaseLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/releases', true);
-            if ( releaseLinkPathObj.existsSync() && !releaseLinkPathObj.isSymlinkSync() ) {
+            if (
+                releaseLinkPathObj.existsSync()
+                && !releaseLinkPathObj.isSymlinkSync()
+                ||
+                releaseLinkPathObj.existsSync()
+                && fs.readlinkSync(releaseLinkPathObj.toString()) != cmd.projectReleasesPath
+            ) {
                 releaseLinkPathObj.rmSync();
             }
             if (!releaseLinkPathObj.existsSync()) {
@@ -580,7 +592,13 @@ function CmdHelper(cmd, client, debug) {
             cmd.projectLogsPath = projectLogsPathObj.toString();
             // logs symlink
             var logLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/logs', true);
-            if ( logLinkPathObj.existsSync() && !logLinkPathObj.isSymlinkSync() ) {
+            if (
+                logLinkPathObj.existsSync()
+                && !logLinkPathObj.isSymlinkSync()
+                ||
+                logLinkPathObj.existsSync()
+                && fs.readlinkSync(logLinkPathObj.toString()) != cmd.projectLogsPath
+            ) {
                 logLinkPathObj.rmSync();
             }
             if (!logLinkPathObj.existsSync()) {
@@ -596,7 +614,13 @@ function CmdHelper(cmd, client, debug) {
             cmd.projectTmpPath = projectTmpPathObj.toString();
             // tmp symlink
             var tmpLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/tmp', true);
-            if ( tmpLinkPathObj.existsSync() && !tmpLinkPathObj.isSymlinkSync() ) {
+            if (
+                tmpLinkPathObj.existsSync()
+                && !tmpLinkPathObj.isSymlinkSync()
+                ||
+                tmpLinkPathObj.existsSync()
+                && fs.readlinkSync(tmpLinkPathObj.toString()) != cmd.projectTmpPath
+            ) {
                 tmpLinkPathObj.rmSync();
             }
             if (!tmpLinkPathObj.existsSync()) {

package/framework/{v0.1.6-alpha.4 → v0.1.6-alpha.41}/lib/cmd/protocol/list.js

@@ -13,12 +13,12 @@ var console = lib.logger;
  *
  * */
 function List(opt, cmd) {
-    
+
     // self will be pre filled if you call `new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled })`
     var self = {}, local = {};
 
-    var init = function() {      
-        //debugger;  
+    var init = function() {
+        //debugger;
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
@@ -56,7 +56,7 @@ function List(opt, cmd) {
 
 
     var listAllByProject = function() {
-        
+
         var protocols       = null
             , schemes       = null
             , projects      = self.projects
@@ -78,7 +78,7 @@ function List(opt, cmd) {
 
         p = 0;
         for (; p < list.length; ++p) {
-                           
+
             str += '------------------------------------\n\r';
             if (!projects[list[p]].exists) {
                 str += '?! '
@@ -87,61 +87,62 @@ function List(opt, cmd) {
             str += '------------------------------------\n\r';
             protocols = projects[list[p]].protocols;
             schemes = projects[list[p]].schemes;
-            
+
             if (!protocols) continue;
-            
+
             str += '      Protocol(s)        Scheme(s)\n\r';
-            
-            
+
+
             indexObj = {}; index = 2;
             i = 0; len = protocols.length;
             for (; i < len; ++i) {
-                protocolStr = '';               
-                if (self.defaultProtocol == protocols[i]) {
+                protocolStr = '';
+                if (projects[list[p]].def_protocol == protocols[i]) {
                     protocolStr += '[ * ] ' + protocols[i]
                 } else {
                     protocolStr += '[   ] ' + protocols[i]
-                }                
-                
+                }
+
                 if ( (index % 2) == 0 ){
                     indexObj[index] = protocolStr;
                     index += 2
                 }
             }
-            
-            
+
+
             index = 3;
             i = 0; len = schemes.length;
             for (; i < len; ++i) {
                 schemeStr = '';
-                if (self.defaultScheme == schemes[i]) {
+                if (projects[list[p]].def_scheme == schemes[i]) {
                     schemeStr += '           [ * ] ' + schemes[i]
                 } else {
                     schemeStr += '           [   ] ' + schemes[i]
                 }
-                      
+
                 if ( (index % 2) != 0 ){
                     indexObj[index] = schemeStr;
-                    index += 2               
-                }                   
+                    index += 2
+                }
             }
-            
+
             i = null;
             for (i in indexObj) {
                 str += indexObj[i];
                 if ( (~~i % 3) == 0 ){
                     str += '\n\r'
-                }                
-            }            
-            
+                }
+            }
+
             str += '\n\r'
         }
-        
-        console.log(str)
+
+        console.log(str);
+        end();
     }
 
     var listByBundle = function(bundleName) {
-        
+
         var protocols       = null
             , schemes       = null
             , bundles       = self.bundlesByProject[self.projectName]
@@ -155,7 +156,7 @@ function List(opt, cmd) {
             , indexObj      = null
             , index         = null
         ;
-        
+
         if ( typeof(bundleName) != 'undefined' ) {
             list.push(bundleName)
         } else {
@@ -165,44 +166,44 @@ function List(opt, cmd) {
             list.sort();
         }
 
-        
+
 
         p = 0;
         for (; p < list.length; ++p) {
-                        
-            
+
+
             str += '------------------------------------\n\r';
             if (!bundles[list[p]].exists) {
                 str += '?! '
             }
             str += list[p] + '\n\r';
             str += '------------------------------------\n\r';
-            
+
             protocols = bundles[list[p]].protocols;
-            schemes = bundles[list[p]].schemes;            
+            schemes = bundles[list[p]].schemes;
             if (!protocols || protocols.length == 0) continue;
-            
-            
+
+
             str += '      Protocol(s)        Scheme(s)\n\r';
-            
-            
+
+
             indexObj = {}; index = 2;
             i = 0; len = protocols.length;
             for (; i < len; ++i) {
-                protocolStr = '';               
+                protocolStr = '';
                 if (bundles[list[p]].def_protocol == protocols[i]) {
                     protocolStr += '[ * ] ' + protocols[i]
                 } else {
                     protocolStr += '[   ] ' + protocols[i]
-                }                
-                
+                }
+
                 if ( (index % 2) == 0 ){
                     indexObj[index] = protocolStr;
                     index += 2
                 }
             }
-            
-            
+
+
             index = 3;
             i = 0; len = schemes.length;
             for (; i < len; ++i) {
@@ -212,27 +213,47 @@ function List(opt, cmd) {
                 } else {
                     schemeStr += '           [   ] ' + schemes[i]
                 }
-                      
+
                 if ( (index % 2) != 0 ){
                     indexObj[index] = schemeStr;
-                    index += 2               
-                }                   
+                    index += 2
+                }
             }
-            
+
             i = null;
             for (i in indexObj) {
                 str += indexObj[i];
                 if ( (~~i % 3) == 0 ){
                     str += '\n\r'
-                }                
-            }            
-            
+                }
+            }
+
             str += '\n\r'
         }
-        
-        console.log(str)
+
+        console.log(str);
+        end();
     };
 
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init()
 };