bdy 1.9.30 → 1.9.32-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.9.30",
+  "version": "1.9.32-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/server/http1.js

@@ -56,7 +56,8 @@ class ServerHttp1 extends events_1.default {
         req.end();
     }
     checkHostHeader(req, res, host) {
-        if (req.headers.host === host)
+        const headerHost = (req.headers.host || '').split(':')[0];
+        if (headerHost === host)
             return true;
         else {
             res.statusCode = 421;

package/distTs/src/server/http2.js

@@ -56,7 +56,8 @@ class ServerHttp2 extends events_1.default {
         req.end();
     }
     checkHostHeader(req, res, host) {
-        if (req.headers[':authority'] === host)
+        const headerHost = (req.headers[':authority'] || '').split(':')[0];
+        if (headerHost === host)
             return true;
         else {
             res.statusCode = 421;

package/distTs/src/tunnel/http.js

@@ -121,25 +121,27 @@ class TunnelHttp extends events_1.default {
         }
         return h;
     }
-    getClearedHeaders(headers = {}, compressionMethod) {
+    getClearedHeaders(headers = {}, compressionMethod, allowUpgrade = false) {
         const hop = [
             ':method',
             ':path',
             ':scheme',
             ':authority',
             ':status',
-            'keep-alive',
             'host',
-            'connection',
             'proxy-authenticate',
             'proxy-connection',
-            'Proxy-authorization',
+            'proxy-authorization',
             'trailer',
-            'upgrade',
             'transfer-encoding',
             'strict-transport-security',
             'te',
         ];
+        if (!(allowUpgrade && headers.connection === 'Upgrade')) {
+            hop.push('upgrade');
+            hop.push('connection');
+            hop.push('keep-alive');
+        }
         const tmp = {};
         if (compressionMethod &&
             compressionMethod !== utils_1.TUNNEL_COMPRESSION_METHOD_IDENTITY) {
@@ -152,6 +154,15 @@ class TunnelHttp extends events_1.default {
                 tmp[name] = headers[name];
             }
         });
+        tmp['access-control-allow-origin'] = '*';
+        if (tmp['set-cookie']) {
+            const setCookie = [];
+            const h = (this.req.headers.host || this.req.headers[':authority'] || '').split(':')[0];
+            tmp['set-cookie'].forEach((cookie) => {
+                setCookie.push(cookie.replaceAll(/([dD]omain)=[\w_\-\\.]+/ig, `$1=${h}`));
+            });
+            tmp['set-cookie'] = setCookie;
+        }
         return tmp;
     }
     getPath() {
@@ -169,7 +180,7 @@ class TunnelHttp extends events_1.default {
         const method = this.getMethod();
         const path = this.getPath();
         const headers = {
-            ...this.getClearedHeaders(reqHeaders),
+            ...this.getClearedHeaders(reqHeaders, null, true),
             ...this.headers,
             ...this.getRequestHeaders(false),
         };
@@ -184,6 +195,24 @@ class TunnelHttp extends events_1.default {
             headers,
         });
         this.logRequest = this.httpLog.newRequest(method, headers, path, utils_1.TUNNEL_IDENTIFIED_HTTP1, this.req);
+        r.on('upgrade', (proxyRes, socket) => {
+            const headers = this.getClearedHeaders(proxyRes.headers, null, true);
+            let msg = 'HTTP/1.1 101 Web Socket Protocol Handshake\r\n';
+            Object.keys(headers).forEach((k) => {
+                const v = headers[k];
+                if (Array.isArray(v)) {
+                    v.forEach((vv) => {
+                        msg += `${k}: ${vv}\r\n`;
+                    });
+                }
+                else {
+                    msg += `${k}: ${v}\r\n`;
+                }
+            });
+            msg += '\r\n';
+            this.req.socket.write(msg);
+            this.req.socket.pipe(socket).pipe(this.req.socket);
+        });
         r.on('response', (proxyRes) => {
             this.proxyRes = proxyRes;
             const statusCode = this.proxyRes.statusCode;
@@ -209,7 +238,7 @@ class TunnelHttp extends events_1.default {
         const reqHeaders = this.req.headers;
         const method = this.getMethod();
         const headers = {
-            ...this.getClearedHeaders(reqHeaders),
+            ...this.getClearedHeaders(reqHeaders, null, true),
             ...this.headers,
             ...this.getRequestHeaders(false),
         };
@@ -226,6 +255,24 @@ class TunnelHttp extends events_1.default {
             headers,
         });
         this.logRequest = this.httpLog.newRequest(method, headers, path, utils_1.TUNNEL_IDENTIFIED_HTTP1, this.req);
+        r.on('upgrade', (proxyRes, socket) => {
+            const headers = this.getClearedHeaders(proxyRes.headers, null, true);
+            let msg = 'HTTP/1.1 101 Web Socket Protocol Handshake\r\n';
+            Object.keys(headers).forEach((k) => {
+                const v = headers[k];
+                if (Array.isArray(v)) {
+                    v.forEach((vv) => {
+                        msg += `${k}: ${vv}\r\n`;
+                    });
+                }
+                else {
+                    msg += `${k}: ${v}\r\n`;
+                }
+            });
+            msg += '\r\n';
+            this.req.socket.write(msg);
+            this.req.socket.pipe(socket).pipe(this.req.socket);
+        });
         r.on('response', (proxyRes) => {
             this.proxyRes = proxyRes;
             const statusCode = this.proxyRes.statusCode;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.9.30",
+  "version": "1.9.32-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {