From 0c2c55726e4d7d5ac881ea6c4b958910224495df Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 1 Nov 2022 14:23:46 -0700
Subject: [PATCH] Fixed web relay when used with local device group.

---
 apprelays.js      | 15 +++++++++------
 webrelayserver.js |  2 +-
 webserver.js      |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apprelays.js b/apprelays.js
index 1fc7ea3a..a61948fc 100644
--- a/apprelays.js
+++ b/apprelays.js
@@ -69,7 +69,7 @@ function SerialTunnel(options) {
 }
 
 // Construct a Web relay object
-module.exports.CreateWebRelaySession = function (parent, db, req, args, domain, userid, nodeid, addr, port, appid, sessionid, expire) {
+module.exports.CreateWebRelaySession = function (parent, db, req, args, domain, userid, nodeid, addr, port, appid, sessionid, expire, mtype) {
     const obj = {};
     obj.parent = parent;
     obj.lastOperation = Date.now();
@@ -81,6 +81,7 @@ module.exports.CreateWebRelaySession = function (parent, db, req, args, domain,
     obj.appid = appid;
     obj.sessionid = sessionid;
     obj.expireTimer = null;
+    obj.mtype = mtype;
     var pendingRequests = [];
     var nextTunnelId = 1;
     var tunnels = {};
@@ -164,7 +165,7 @@ module.exports.CreateWebRelaySession = function (parent, db, req, args, domain,
         // Launch a new tunnel
         if (obj.closed == true) return;
         parent.parent.debug('webrelay', 'launchNewTunnel');
-        const tunnel = module.exports.CreateWebRelay(obj, db, args, domain);
+        const tunnel = module.exports.CreateWebRelay(obj, db, args, domain, obj.mtype);
         tunnel.onclose = function (tunnelId, processedCount) {
             if (tunnels == null) return;
             parent.parent.debug('webrelay', 'tunnel-onclose');
@@ -238,7 +239,7 @@ module.exports.CreateWebRelaySession = function (parent, db, req, args, domain,
 
 
 // Construct a Web relay object
-module.exports.CreateWebRelay = function (parent, db, args, domain) {
+module.exports.CreateWebRelay = function (parent, db, args, domain, mtype) {
     //const Net = require('net');
     const WebSocket = require('ws')
 
@@ -249,6 +250,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
     obj.isWebSocket = false; // If true, this request will not close and so, it can't be allowed to hold up other requests
     obj.isStreaming = false; // If true, this request will not close and so, it can't be allowed to hold up other requests
     obj.processedRequestCount = 0;
+    obj.mtype = mtype;
     const constants = (require('crypto').constants ? require('crypto').constants : require('constants')); // require('constants') is deprecated in Node 11.10, use require('crypto').constants instead.
 
     // Events
@@ -260,7 +262,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
     // Called when we need to close the tunnel because the response stream has closed
     function handleResponseClosure() { obj.close(); }
 
-    // Return copkie name and values
+    // Return cookie name and values
     function parseRequestCookies(cookiesString) {
         var r = {};
         if (typeof cookiesString != 'string') return r;
@@ -437,7 +439,7 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
         obj.relayActive = false;
     };
 
-    // Start the looppback server
+    // Start the loopback server
     obj.connect = function (userid, nodeid, addr, port, appid) {
         if (obj.relayActive || obj.closed) return;
         obj.addr = addr;
@@ -687,7 +689,8 @@ module.exports.CreateWebRelay = function (parent, db, args, domain) {
 
             // If there is a header, send it
             if (header != null) {
-                obj.res.status(parseInt(header.Directive[1])); // Set the status
+                const statusCode = parseInt(header.Directive[1]);
+                if ((!isNaN(statusCode)) && (statusCode > 0) && (statusCode <= 999)) { obj.res.status(statusCode); } // Set the status
                 const blockHeaders = ['Directive', 'sec-websocket-extensions', 'connection', 'transfer-encoding', 'last-modified', 'content-security-policy', 'cache-control']; // We do not forward these headers 
                 for (var i in header) {
                     if (i == 'set-cookie') {
diff --git a/webrelayserver.js b/webrelayserver.js
index 2c6a31f3..900877a9 100644
--- a/webrelayserver.js
+++ b/webrelayserver.js
@@ -259,7 +259,7 @@ module.exports.CreateWebRelayServer = function (parent, db, args, certificates,
                 if (xrelaySession != null) { xrelaySession.close(); delete relaySessions[webSessionId]; }
 
                 // Create a web relay session
-                const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid, webSessionId, expire);
+                const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid, webSessionId, expire, node.mtype);
                 relaySession.xpublicid = publicid;
                 relaySession.onclose = function (sessionId) {
                     // Remove the relay session
diff --git a/webserver.js b/webserver.js
index c2985911..ba31b2c6 100644
--- a/webserver.js
+++ b/webserver.js
@@ -6865,7 +6865,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
                             if (xrelaySession != null) { xrelaySession.close(); delete webRelaySessions[xrelaySessionId]; }
 
                             // Create a web relay session
-                            const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid, xrelaySessionId, expire);
+                            const relaySession = require('./apprelays.js').CreateWebRelaySession(obj, db, req, args, domain, userid, nodeid, addr, port, appid, xrelaySessionId, expire, node.mtype);
                             relaySession.xpublicid = publicid;
                             relaySession.onclose = function (sessionId) {
                                 // Remove the relay session