bdy 1.16.15-dev → 1.16.17-dev

package/distTs/src/tunnel/cfg.js

@@ -172,6 +172,17 @@ class Cfg {
             this.json.apiToken = token;
         this.save();
     }
+    setApiClient(clientId, clientSecret) {
+        if (!clientId || !clientSecret) {
+            delete this.json.apiClientId;
+            delete this.json.apiClientSecret;
+        }
+        else {
+            this.json.apiClientId = clientId;
+            this.json.apiClientSecret = clientSecret;
+        }
+        this.save();
+    }
     setWhitelist(whitelist) {
         if (!whitelist || !whitelist.length)
             delete this.json.whitelist;
@@ -192,6 +203,12 @@ class Cfg {
     getApiToken() {
         return this.json.apiToken || '';
     }
+    getApiClientId() {
+        return this.json.apiClientId || '';
+    }
+    getApiClientSecret() {
+        return this.json.apiClientSecret || '';
+    }
     getTokenHost() {
         const token = this.getToken();
         if (!token) {

package/distTs/src/tunnel/server/http1.js

@@ -11,9 +11,11 @@ const texts_1 = require("../../texts");
 const tunnel_1 = require("../../types/tunnel");
 class ServerHttp1 extends events_1.default {
     server;
+    host;
     constructor(host) {
         super();
-        this.server = http_1.default.createServer((req, res) => this.processRequest(req, res, host));
+        this.host = host;
+        this.server = http_1.default.createServer((req, res) => this.processRequest(req, res));
         this.server.on('connection', (socket) => {
             socket.id = (0, uuid_1.v4)();
             this.emit(tunnel_1.TUNNEL_HTTP_SOCKET.OPEN, socket);
@@ -46,7 +48,10 @@ class ServerHttp1 extends events_1.default {
             method: logRequest.method,
             setHost: false,
             path: logRequest.url,
-            headers: logRequest.headers,
+            headers: {
+                ...logRequest.headers,
+                host: this.host
+            },
         });
         if (logRequest.requestBody.data.length > 0)
             req.write(logRequest.requestBody.data);
@@ -60,9 +65,9 @@ class ServerHttp1 extends events_1.default {
         });
         req.end();
     }
-    checkHostHeader(req, res, host) {
+    checkHostHeader(req, res) {
         const headerHost = (req.headers.host || '').split(':')[0];
-        if (headerHost === host)
+        if (headerHost === this.host)
             return true;
         else {
             res.statusCode = 421;
@@ -70,8 +75,8 @@ class ServerHttp1 extends events_1.default {
             return false;
         }
     }
-    async processRequest(req, res, host) {
-        if (!this.checkHostHeader(req, res, host))
+    async processRequest(req, res) {
+        if (!this.checkHostHeader(req, res))
             return;
         logger_1.default.debug((0, texts_1.LOG_HTTP1_REQUEST)(req.method, req.url));
         this.emit(tunnel_1.TUNNEL_EVENT.HTTP_REQUEST, req, res);

package/distTs/src/tunnel/server/http2.js

@@ -11,9 +11,11 @@ const texts_1 = require("../../texts");
 const tunnel_1 = require("../../types/tunnel");
 class ServerHttp2 extends events_1.default {
     server;
+    host;
     constructor(host) {
         super();
-        this.server = http2_1.default.createServer((req, res) => this.processRequest(req, res, host));
+        this.host = host;
+        this.server = http2_1.default.createServer((req, res) => this.processRequest(req, res));
         this.server.on('session', (session) => {
             session.id = (0, uuid_1.v4)();
             this.emit(tunnel_1.TUNNEL_EVENT.HTTP_SESSION_OPEN, session);
@@ -43,7 +45,10 @@ class ServerHttp2 extends events_1.default {
         let client = http2_1.default.connect(`http://localhost:${address.port}`, {
             maxSessionMemory: 100,
         });
-        let req = client.request(logRequest.headers);
+        let req = client.request({
+            ...logRequest.headers,
+            ':authority': this.host
+        });
         if (logRequest.requestBody.data.length > 0)
             req.write(logRequest.requestBody.data);
         req.on('response', () => {
@@ -64,9 +69,12 @@ class ServerHttp2 extends events_1.default {
         });
         req.end();
     }
-    checkHostHeader(req, res, host) {
+    checkHostHeader(req, res) {
+        logger_js_1.default.info('checkHostHeader');
+        logger_js_1.default.info(this.host);
+        logger_js_1.default.info(req.headers[':authority']);
         const headerHost = (req.headers[':authority'] || '').split(':')[0];
-        if (headerHost === host)
+        if (headerHost === this.host)
             return true;
         else {
             res.statusCode = 421;
@@ -74,8 +82,8 @@ class ServerHttp2 extends events_1.default {
             return false;
         }
     }
-    async processRequest(req, res, host) {
-        if (!this.checkHostHeader(req, res, host))
+    async processRequest(req, res) {
+        if (!this.checkHostHeader(req, res))
             return;
         logger_js_1.default.debug((0, texts_1.LOG_HTTP2_REQUEST)(req.method, req.url));
         this.emit(tunnel_1.TUNNEL_EVENT.HTTP_REQUEST, req, res);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.16.15-dev",
+  "version": "1.16.17-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -31,6 +31,7 @@
     "eventsource": "4.0.0",
     "fastify": "4.28.1",
     "fdir": "6.5.0",
+    "open": "11.0.0",
     "fflate": "0.8.2",
     "human-id": "^4.1.3",
     "isbinaryfile": "5.0.2",