gina 0.1.6-alpha.9 → 0.1.6-alpha.91

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.91}/core/router.js

@@ -1,7 +1,7 @@
 //"use strict";
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2025 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -94,6 +94,13 @@ function Router(env, scope) {
         return self.serverInstance;
     }
 
+    /**
+     * Check if env is running cacheless
+     * */
+    this.isCacheless = function() {
+        return (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+    }
+
 
     /**
      * Route on the fly
@@ -118,6 +125,73 @@ function Router(env, scope) {
         // }
         // return ;
 
+
+       var serverInstance   = self.getServerInstance();
+       var config               = null
+            , conf              = null
+            , bundle            = null
+            , env               = null
+            , scope             = null
+            , isCacheless       = self.isCacheless()
+       ;
+        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.isCacheless   = isCacheless;
+        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 +214,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,44 +361,8 @@ 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) {
+        if (isCacheless) {
             refreshCoreDependencies();
         }
 
@@ -416,14 +457,18 @@ 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,
+            isCacheless     : isCacheless,
+            path            : params.param.path || null, // user custom path : namespace should be ignored or left blank
+            assets          : {}
         };
 
         if (routeHasViews) {
             options.template = (routeHasViews) ? conf.content.templates[templateName] || conf.content.templates._common : undefined;
+            options.template.externalPlugins = [];
+            if ( /http\/2/.test(conf.server.protocol) ) {
+                options.template.h2Links = '';
+            }
         }
 
         // Options need to be protected by a clone to allow overrides
@@ -456,7 +501,7 @@ function Router(env, scope) {
             }
             setupFileObj = null;
 
-            if (cacheless) {
+            if (isCacheless) {
                 if (hasControllerNamespace) {
                     delete require.cache[require.resolve(_(mainControllerFile, true))];
                 }
@@ -504,7 +549,7 @@ function Router(env, scope) {
              * */
             var requireController = function (namespace, options) {
 
-                var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
+                var isCacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
                 var corePath    = getPath('gina').core;
                 var config      = getContext('gina').Config.instance;
                 var bundle      = config.bundle;
@@ -524,7 +569,7 @@ function Router(env, scope) {
 
                 try {
 
-                    //if (cacheless) {
+                    //if (isCacheless) {
                         // Super controller
                         delete require.cache[require.resolve(_(corePath +'/controller/index.js', true))];
                         require.cache[_(corePath +'/controller/index.js', true)] = require( _(corePath +'/controller/index.js', true) );
@@ -713,7 +758,7 @@ function Router(env, scope) {
                 filename = sharedFilename;
             }
 
-            if (local.cacheless) delete require.cache[require.resolve(_(filename, true))];
+            if (local.isCacheless) delete require.cache[require.resolve(_(filename, true))];
 
             var MiddlewareClass = function(req, res, next) {
                 // getting rid of the middleware context
@@ -725,7 +770,7 @@ function Router(env, scope) {
                         sharedFilenameObj.existsSync()
                         && filename != sharedFilename
                     ) {
-                        if (local.cacheless) delete require.cache[require.resolve(_(sharedFilename, true))];
+                        if (local.isCacheless) delete require.cache[require.resolve(_(sharedFilename, true))];
                         // sharedFilename as SuperClass
                         Middleware = inherits(require(_(filename, true)), require(_(sharedFilename, true)));
                     }

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.91}/core/server.isaac.js

@@ -65,6 +65,26 @@ function ServerEngineClass(options) {
         return fs.readFileSync(filename).toString()
     }
 
+    var localAssets = null;
+    try {
+        localAssets = [
+            {
+                file    : 'public_suffix_list.dat',
+                path    : getPath('gina').lib +'/domain/dist',
+                mime    : 'text/plain; charset=utf8'
+            }
+        ];
+        for (let i=0, len=localAssets.length; i<len; i++) {
+            let fileName  =  _(localAssets[i].path +'/'+ localAssets[i].file, true)
+            localAssets[i].content = readSync(fileName);
+        }
+    } catch (assetsError) {
+        // TODO - Reuse the default or the project 404 page
+        fileContent = 'Not found';
+        console.error('[ SERVER ] '+ assetsError.stack);
+    }
+
+
     // 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) ) {
@@ -150,35 +170,101 @@ function ServerEngineClass(options) {
 
     const onPath = function(path, cb, allowAll) {
 
-        var queryParams = null
-            , i         = null
-            , len       = null
-            , p         = null
-            , arr       = null
-            , a         = null
+        var queryParams     = null
+            , i             = null
+            , len           = null
+            , p             = null
+            , arr           = null
+            , a             = null
+            , isProxyHost   = null
+            , requestHost   = null
         ;
 
         // http2stream handle by the Router class & the SuperController class
         // See `${core}/router.js` & `${core}/controller/controller.js`
 
         server.on('request', (request, response) => {
+            // Proxy detection
+            isProxyHost = getContext('isProxyHost') || false;
+            requestHost = request.headers.host || request.headers[':authority'];
+            if (
+                !isProxyHost
+                && !/\:[0-9]+$/.test(requestHost)
+                ||
+                !isProxyHost
+                && request.headers['x-forwarded-host']
+            ) {
+                // Enable proxied mode
+                process.gina.PROXY_HOSTNAME = process.gina.PROXY_SCHEME +'://'+ requestHost;
+                process.gina.PROXY_HOST     = requestHost;
+                // For intera services communications - Eg.: Controller::query()
+                if (request.headers['x-forwarded-host']) {
+                    process.gina.PROXY_HOSTNAME = request.headers['x-forwarded-proto'] +'://'+ request.headers['x-forwarded-host'];
+                    process.gina.PROXY_HOST     = request.headers['x-forwarded-host'];
+                }
+                // Forcing context - also available for workers
+                setContext('isProxyHost', true);
+            }
+
+            // TODO - remove this after k8s test
+            // if (
+            //     // skip internal requests like healthcheck
+            //     !/^localhost:[0-9]+$/.test(requestHost)
+            //     && /^true$/.test(isProxyHost)
+            //     && /\:[0-9]+$/.test(requestHost)
+            //     && !hostnameRE.test(requestHost)
+            // ) {
+            //     // Restoring non-proxied mode
+            //     console.debug('[ SERVER ] proxy disabled: '+ process.gina.PROXY_SCHEME +'://'+ requestHost);
+            //     isProxyHost = false;
+            //     setContext('isProxyHost', isProxyHost);
+            // }
+
             // healthcheck
             // TODO - add a top level API : server.api.js (check, get ...)
             // TODO - on 90% RAM usage, redirect to `come back later then restart bundle`
             // TODO - check url against wroot : getContext() ?
             if ( /^get$/i.test(request.method) && /\_gina\/health\/check$/i.test(request.url) ) {
                 // server.toApi(reques, response)
-                // console.debug('[200] '+ request.url);
-                response.setHeader('content-type', 'application/json; charset=utf8' );
-                response.setHeader('x-powered-by', 'Gina/'+ GINA_VERSION );
+                // console.debug('[ SERVER ][200] '+ request.url);
+                response.setHeader('content-type', 'application/json; charset=utf8');
+                response.setHeader('x-powered-by', 'Gina/'+ GINA_VERSION);
+
                 return response.end('{"status":"ok"}');
             }
+
+
+            if ( /^get$/i.test(request.method) && /\_gina\/assets\/public_suffix_list.dat$/i.test(request.url) ) {
+                // server.toApi(reques, response)
+                // console.debug('[ SERVER ][200] '+ request.url);
+
+                response.setHeader('content-type', localAssets[0].mime);
+                response.setHeader('vary', 'Origin');
+                response.setHeader('cache-control', 'public,max-age=86400');
+                response.setHeader('x-content-type-options', 'nosniff');
+                response.setHeader('x-frame-options', 'DENY');
+                response.setHeader('x-xss-protection', '1; mode=block');
+                response.setHeader('x-powered-by', 'Gina/'+ GINA_VERSION);
+
+                return response.end(localAssets[0].content);
+            }
+
+
             if (isDev) {
                 refreshCore()
             }
 
+            // Caching = [...]
+            // TODO - handle this through a middleware
+            /**
+            * var cacheIndex = ['/api/document/get/b47c4dd3-f7c4-44b2-b1fb-401948be1ca4'].indexOf(request.url)
+            * if ( cacheIndex > -1) {
+            *     // return caching[cacheIndex].content
+            * }
+            */
+
             if ( /engine.io/.test(request.url)) {
-                console.debug('io request');
+                console.debug('[ SERVER ] engine.io request');
             }
 
             if (/^\*$/.test(path) || path == request.url) {