Update reverse-proxy-mod to 1.1.4

index.js

@@ -1,6 +1,9 @@
 var fs = require("fs");
+var os = require("os");
 var http = require("http");
 var https = require("https");
+var net = require("net");
+var tls = require("tls");
 
 var proxyConfig = {};
 if (fs.existsSync(__dirname + "/../../../reverse-proxy-config.json")) proxyConfig = JSON.parse(fs.readFileSync(__dirname + "/../../../reverse-proxy-config.json").toString());
@@ -8,16 +11,21 @@ else fs.writeFileSync(__dirname + "/../../../reverse-proxy-config.json", "{}");
 
 function Mod() {}
 Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd, href, ext, uobject, search, defaultpage, users, page404, head, foot, fd, elseCallback, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData) {
-  return function() {
+  return function () {
     var hostnames = Object.keys(proxyConfig);
+    var isPath = false;
     var matchingHostname = null;
     for (var i = 0; i < hostnames.length; i++) {
       if (hostnames[i] == "*") {
         matchingHostname = "*";
         break;
+      } else if (hostnames[i][0] == "/" && (href == hostnames[i] || href.indexOf(hostnames[i] + "/") == 0)) {
+        matchingHostname = hostnames[i];
+        isPath = true;
+        break;
       } else if (req.headers.host && hostnames[i].indexOf("*.") == 0 && hostnames[i] != "*.") {
         var hostnamesRoot = hostnames[i].substr(2);
-        if (req.headers.host == hostnamesRoot || req.headers.host.indexOf("." + hostnamesRoot) == req.headers.host.length - hostnamesRoot.length - 1) {
+        if (req.headers.host == hostnamesRoot || (req.headers.host.length > hostnamesRoot.length && req.headers.host.indexOf("." + hostnamesRoot) == req.headers.host.length - hostnamesRoot.length - 1)) {
           matchingHostname = hostnames[i];
           break;
         }
@@ -34,7 +42,7 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
       if (!port) port = 80;
       if (!securePort && secureHostname) securePort = 443;
       if (!hostname) {
-        callServerError(500, "reverse-proxy-mod/1.0.2", new Error("Proxy server is misconfigured. Hostname property is missing."));
+        callServerError(500, "reverse-proxy-mod/1.1.4", new Error("Proxy server is misconfigured. Hostname property is missing."));
         return;
       }
       try {
@@ -43,6 +51,15 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
           res.removeHeader(x[i]);
         }
       } catch (ex) {}
+      var preparedPath = req.url;
+      if(isPath) {
+        if(preparedPath == matchingHostname) {
+          preparedPath = "/";
+        } else {
+          preparedPath = preparedPath.replace(matchingHostname.substring(1) + "/","");
+          if(preparedPath == "") preparedPath = "/";
+        }
+      }
       var hdrs = JSON.parse(JSON.stringify(req.headers));
       hdrs["x-forwarded-for"] = req.socket.remoteAddress;
       hdrs["x-forwarded-proto"] = req.socket.encrypted ? "https" : "http";
@@ -52,42 +69,94 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
       delete hdrs[":authority"];
       delete hdrs[":path"];
       delete hdrs["keep-alive"];
-      hdrs["connection"] = "close";
+      if ((req.httpVersion == "1.1" || req.httpVersion == "1.0") && String(hdrs["connection"]).toLowerCase() == "upgrade") {
-      var options = {
+        var socket = ((secureHostname && req.socket.encrypted) ? tls : net).createConnection({
-        hostname: (secureHostname && req.socket.encrypted) ? secureHostname : hostname,
+          host: (secureHostname && req.socket.encrypted) ? secureHostname : hostname,
-        port: (secureHostname && req.socket.encrypted) ? securePort : port,
+          port: (secureHostname && req.socket.encrypted) ? securePort : port,
-        path: req.url,
+          joinDuplicateHeaders: true,
-        method: req.method,
+          rejectUnauthorized: false
-        headers: hdrs,
+        }, function () {
-        joinDuplicateHeaders: true,
+          serverconsole.resmessage("Connected to back-end!");
-        rejectUnauthorized: false
+          socket.pipe(res.socket);
-      };
+          socket.write(req.method + " " + preparedPath + " HTTP/1.1\r\n");
-      var proxy = ((secureHostname && req.socket.encrypted) ? https : http).request(options, function(sres) {
+          Object.keys(hdrs).forEach(function (headerName) {
-        serverconsole.resmessage("Connected to back-end!");
+            var header = hdrs[headerName];
-        delete sres.headers["connection"];
+            if (typeof header === "object") {
-        delete sres.headers["Connection"];
+              header.forEach(function (value) {
-        delete sres.headers["transfer-encoding"];
+                socket.write(headerName + ": " + value + "\r\n");
-        delete sres.headers["Transfer-Encoding"];
+              });
-        delete sres.headers["keep-alive"];
+            } else {
-        delete sres.headers["Keep-Alive"];
+              socket.write(headerName + ": " + header + "\r\n");
-        res.writeHead(sres.statusCode, sres.headers);
+            }
-        sres.pipe(res, {
+          });
-          end: true
+          socket.write("\r\n");
+          req.socket.pipe(socket);
+        }).on("error", (ex) => {
+          try {
+            if (ex.code == "ENOTFOUND" || ex.code == "EHOSTUNREACH" || ex.code == "ECONNREFUSED") {
+              callServerError(503, "reverse-proxy-mod/1.1.4", ex); //Server error
+            } else if (ex.code == "ETIMEDOUT") {
+              callServerError(504, "reverse-proxy-mod/1.1.4", ex); //Server error
+            } else {
+              callServerError(502, "reverse-proxy-mod/1.1.4", ex); //Server error
+            }
+          } catch (ex) {}
+          serverconsole.errmessage("Client fails to recieve content."); //Log into SVR.JS
         });
-      });
+      } else {
-      proxy.on("error", (ex) => {
+        if (String(hdrs["connection"]).toLowerCase() != "upgrade") hdrs["connection"] = "close";
-        try {
+        var options = {
-          if (ex.code == "ETIMEDOUT") {
+          hostname: (secureHostname && req.socket.encrypted) ? secureHostname : hostname,
-            callServerError(504, "reverse-proxy-mod/1.0.2", ex); //Server error
+          port: (secureHostname && req.socket.encrypted) ? securePort : port,
-          } else {
+          path: preparedPath,
-            callServerError(502, "reverse-proxy-mod/1.0.2", ex); //Server error
+          method: req.method,
+          headers: hdrs,
+          joinDuplicateHeaders: true,
+          rejectUnauthorized: false
+        };
+        var proxy = ((secureHostname && req.socket.encrypted) ? https : http).request(options, function (sres) {
+          serverconsole.resmessage("Connected to back-end!");
+          if (String(hdrs["connection"]).toLowerCase() != "upgrade") {
+            delete sres.headers["connection"];
+            delete sres.headers["Connection"];
           }
-        } catch (ex) {}
+          delete sres.headers["transfer-encoding"];
-        serverconsole.errmessage("Client fails to recieve content."); //Log into SVR.JS
+          delete sres.headers["Transfer-Encoding"];
-      });
+          delete sres.headers["keep-alive"];
-      req.pipe(proxy, {
+          delete sres.headers["Keep-Alive"];
-        end: true
+          try {
-      });
+            res.writeHead(sres.statusCode, sres.headers);
+            sres.pipe(res);
+            res.prependListener("end", function () {
+              try {
+                sres.end();
+              } catch (ex) {}
+            });
+          } catch (ex) {
+            callServerError(502, "reverse-proxy-mod/1.1.4", ex); //Server error
+          }
+        });
+        proxy.on("error", function (ex) {
+          try {
+            if (ex.code == "ENOTFOUND" || ex.code == "EHOSTUNREACH" || ex.code == "ECONNREFUSED") {
+              callServerError(503, "reverse-proxy-mod/1.1.4", ex); //Server error
+            } else if (ex.code == "ETIMEDOUT") {
+              callServerError(504, "reverse-proxy-mod/1.1.4", ex); //Server error
+            } else {
+              callServerError(502, "reverse-proxy-mod/1.1.4", ex); //Server error
+            }
+          } catch (ex) {}
+          serverconsole.errmessage("Client fails to recieve content."); //Log into SVR.JS
+        });
+        req.pipe(proxy);
+        req.prependListener("end", function () {
+          try {
+            proxy.end();
+          } catch (ex) {}
+        });
+      }
+    } else if ((href == "/reverse-proxy-config.json" || (os.platform() == "win32" && href.toLowerCase() == "/reverse-proxy-config.json")) && path.normalize(__dirname + "/../../..") == process.cwd()) {
+      callServerError(403, "reverse-proxy-mod/1.1.4");
     } else {
       elseCallback();
     }

mod.info

@@ -1,4 +1,4 @@
 {
   "name": "Reverse proxy mod for SVR.JS 3.x",
-  "version": "1.0.3"
+  "version": "1.1.4"
 }