@reldens/server-utils 0.30.0 → 0.32.0

package/lib/app-server-factory/protocol-enforcer.js

@@ -20,14 +20,16 @@ class ProtocolEnforcer
         this.useHttps = config.useHttps || false;
         this.enforceProtocol = config.enforceProtocol !== false;
         app.use((req, res, next) => {
-            let protocol = (req.get('X-Forwarded-Proto') || req.protocol || '').toLowerCase();
+            let forwardedProto = req.get('X-Forwarded-Proto');
+            let protocol = (forwardedProto || req.protocol || '').toLowerCase();
             let host = (req.get('host') || '').toLowerCase().trim();
+            let isBehindProxy = !!forwardedProto;
             if(this.isDevelopmentMode){
                 res.removeHeader('Origin-Agent-Cluster');
                 res.removeHeader('Strict-Transport-Security');
                 res.removeHeader('upgrade-insecure-requests');
                 res.set('Origin-Agent-Cluster', '?0');
-                if(this.enforceProtocol && host){
+                if(this.enforceProtocol && host && !isBehindProxy){
                     if(!this.useHttps && 'https' === protocol){
                         return res.redirect(301, 'http://'+host+req.url);
                     }

package/lib/app-server-factory.js

@@ -16,6 +16,7 @@ const express = require('express');
 const bodyParser = require('body-parser');
 const session = require('express-session');
 const compression = require('compression');
+const tls = require('tls');
 
 class AppServerFactory
 {
@@ -97,30 +98,12 @@ class AppServerFactory
         };
     }
 
-    parseUrl(url)
-    {
-        if(!url || 'string' !== typeof url){
-            return false;
-        }
-        let cleanUrl = url.trim();
-        if(!cleanUrl.startsWith('http://') && !cleanUrl.startsWith('https://')){
-            return false;
-        }
-        let isHttps = cleanUrl.startsWith('https://');
-        let domain = cleanUrl.replace(/^https?:\/\//, '').split(':')[0];
-        return {
-            isHttps,
-            domain,
-            protocol: isHttps ? 'https' : 'http'
-        };
-    }
-
     createAppServer(appServerConfig)
     {
         if(appServerConfig){
             Object.assign(this, appServerConfig);
         }
-        this.processEnvironmentUrls();
+        this.addHttpDomainsAsDevelopment();
         this.detectDevelopmentMode();
         this.setupDevelopmentConfiguration();
         this.setupProtocolEnforcement();
@@ -142,23 +125,23 @@ class AppServerFactory
         return {app: this.app, appServer: this.appServer};
     }
 
-    processEnvironmentUrls()
+    extractDomainFromHttpUrl(url)
     {
-        let publicUrlInfo = this.parseUrl(process.env.RELDENS_PUBLIC_URL);
-        let hostUrlInfo = this.parseUrl(process.env.RELDENS_APP_HOST);
-        if(publicUrlInfo){
-            this.useHttps = publicUrlInfo.isHttps;
-            if(!this.developmentDomains.includes(publicUrlInfo.domain)){
-                this.developmentDomains.push(publicUrlInfo.domain);
-            }
+        if(!url || !url.startsWith('http://')){
+            return false;
         }
-        if(hostUrlInfo){
-            if(!publicUrlInfo){
-                this.useHttps = hostUrlInfo.isHttps;
-            }
-            if(!this.developmentDomains.includes(hostUrlInfo.domain)){
-                this.developmentDomains.push(hostUrlInfo.domain);
-            }
+        return url.replace(/^http:\/\//, '').split(':')[0];
+    }
+
+    addHttpDomainsAsDevelopment()
+    {
+        let hostDomain = this.extractDomainFromHttpUrl(process.env.RELDENS_APP_HOST);
+        let publicDomain = this.extractDomainFromHttpUrl(process.env.RELDENS_PUBLIC_URL);
+        if(hostDomain && !this.developmentDomains.includes(hostDomain)){
+            this.developmentDomains.push(hostDomain);
+        }
+        if(publicDomain && !this.developmentDomains.includes(publicDomain)){
+            this.developmentDomains.push(publicDomain);
         }
     }
 
@@ -405,7 +388,7 @@ class AppServerFactory
                 this.error = {message: 'Could not read domain SSL certificate: '+domain.certPath};
                 return callback(null, null);
             }
-            let ctx = require('tls').createSecureContext({key, cert});
+            let ctx = tls.createSecureContext({key, cert});
             callback(null, ctx);
         };
         return https.createServer(httpsOptions, this.app);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/server-utils",
     "scope": "@reldens",
-    "version": "0.30.0",
+    "version": "0.32.0",
     "description": "Reldens - Server Utils",
     "author": "Damian A. Pastorini",
     "license": "MIT",