@cloud-cli/px 3.4.1 → 3.4.2

package/dist/proxy.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'http';
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { IncomingMessage, ClientRequest, ServerResponse } from 'http';
+import { ServerOptions as HttpsServerOptions } from 'https';
+import { SecureContext } from 'tls';
 import { Resource } from '@cloud-cli/store';
 export declare class ProxyEntry extends Resource {
     id: number;
@@ -10,12 +15,8 @@ export declare class ProxyEntry extends Resource {
     cors: boolean;
     constructor(p: Partial<ProxyEntry>);
 }
-interface Certificates {
-    key: string;
-    cert: string;
-}
 export declare class ProxyServer {
-    protected certs: Record<string, Certificates>;
+    protected certs: Record<string, SecureContext>;
     protected targets: Record<string, ProxyEntry>;
     protected servers: any;
     start(): void;
@@ -23,8 +24,11 @@ export declare class ProxyServer {
     protected loadCertificates(): Promise<void>;
     protected loadTargets(): Promise<void>;
     protected serveRequest(req: IncomingMessage, res: ServerResponse, insecure?: boolean): void;
-    protected getSslOptions(): {
-        SNICallback(domain: string, cb: Function): any;
-    };
+    protected getSslOptions(): HttpsServerOptions;
+    protected findRootDomain(domain: string): SecureContext;
+    protected setHeaders(from: IncomingMessage, to: ServerResponse | ClientRequest): void;
+    protected getOrigin(req: IncomingMessage): URL;
+    protected getHost(string: string): string;
+    protected setCorsHeaders(req: IncomingMessage, res: ServerResponse): void;
+    protected handleError(error: any, res: ServerResponse): void;
 }
-export {};

package/dist/proxy.js

@@ -4,12 +4,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { createServer as createHttpServer, request as httpRequest } from 'http';
+import { createServer as createHttpServer, request as httpRequest, } from 'http';
 import { createServer as createHttpsServer, request as httpsRequest } from 'https';
 import { createSecureContext } from 'tls';
 import { Model, Primary, Property, Query, Resource } from '@cloud-cli/store';
-import { readdir, readFile, stat } from 'fs/promises';
-import { existsSync } from 'fs';
+import { readdir, readFile } from 'fs/promises';
 import { join } from 'path';
 const certificatesFolder = process.env.PX_CERTS_FOLDER || '/etc/letsencrypt/live';
 const certificateFile = 'fullchain.pem';
@@ -62,12 +61,9 @@ export class ProxyServer {
     }
     async loadCertificates() {
         const certs = (this.certs = {});
-        const localCerts = await readdir(certificatesFolder);
-        const folders = await Promise.all(localCerts.map(async (dir) => {
-            const status = await stat(join(certificatesFolder, dir));
-            return status.isDirectory() ? dir : '';
-        }));
-        folders.filter(Boolean).forEach(async (rootDomain) => {
+        const localCerts = await readdir(certificatesFolder, { withFileTypes: true });
+        const folders = localCerts.filter((entry) => entry.isDirectory()).map((dir) => dir.name);
+        for (const rootDomain of folders) {
             if (process.env.DEBUG) {
                 console.log(`Loading certificate for ${rootDomain}`);
             }
@@ -75,7 +71,7 @@ export class ProxyServer {
                 cert: await readFile(join(certificatesFolder, rootDomain, certificateFile), 'utf8'),
                 key: await readFile(join(certificatesFolder, rootDomain, keyFile), 'utf8'),
             });
-        });
+        }
     }
     async loadTargets() {
         const targets = await Resource.find(ProxyEntry, new Query());
@@ -83,7 +79,7 @@ export class ProxyServer {
         targets.forEach((entry) => (this.targets[entry.domain] = entry));
     }
     serveRequest(req, res, insecure = false) {
-        const origin = getOrigin(req);
+        const origin = this.getOrigin(req);
         const proxyEntry = this.targets[origin?.hostname];
         if (!origin.hostname || !proxyEntry) {
             res.writeHead(404, 'Not found');
@@ -107,24 +103,25 @@ export class ProxyServer {
         const url = new URL(req.url, target);
         const isCorsPreflight = req.method === 'OPTIONS' && proxyEntry.cors;
         if (isCorsPreflight) {
-            setCorsHeaders(req, res);
+            this.setCorsHeaders(req, res);
             res.writeHead(204, { 'Content-Length': '0' });
             res.end();
             return;
         }
         const proxyRequest = (url.protocol === 'https:' ? httpsRequest : httpRequest)(url, { method: req.method });
-        setHeaders(req, proxyRequest);
-        proxyRequest.setHeader('host', getHost(target));
+        this.setHeaders(req, proxyRequest);
+        proxyRequest.setHeader('host', this.getHost(target));
         proxyRequest.setHeader('x-forwarded-for', req.headers.host);
-        proxyRequest.setHeader('x-forwarded-proto', insecure ? 'http:' : 'https:');
+        proxyRequest.setHeader('x-forwarded-proto', insecure ? 'http' : 'https');
+        proxyRequest.setHeader('forwarded', 'host=' + req.headers.host + ';proto=' + insecure ? 'http' : 'https');
         req.on('data', (chunk) => proxyRequest.write(chunk));
         req.on('end', () => proxyRequest.end());
-        proxyRequest.on('error', (error) => handleError(error, res));
+        proxyRequest.on('error', (error) => this.handleError(error, res));
         proxyRequest.on('response', (proxyRes) => {
-            setHeaders(proxyRes, res);
+            this.setHeaders(proxyRes, res);
             const isCorsSimple = req.method !== 'OPTIONS' && proxyEntry.cors && req.headers.origin;
             if (isCorsSimple) {
-                setCorsHeaders(req, res);
+                this.setCorsHeaders(req, res);
             }
             res.writeHead(proxyRes.statusCode, proxyRes.statusMessage);
             proxyRes.on('data', (chunk) => res.write(chunk));
@@ -135,59 +132,61 @@ export class ProxyServer {
         const server = this;
         return {
             SNICallback(domain, cb) {
-                // TODO sanitize string to avoid file navigation!
-                const rootDomain = findRootDomain(domain);
-                if (rootDomain in server.certs) {
-                    return cb(null, server.certs[rootDomain]);
+                const rootDomain = server.findRootDomain(domain);
+                if (rootDomain) {
+                    return cb(null, rootDomain);
                 }
-                throw new Error('Not found', { cause: 404 });
+                cb(new Error('Not found', { cause: 404 }), null);
             },
         };
     }
-}
-function findRootDomain(domain) {
-    let rootDomain = '';
-    const parts = domain.split('/')[0].split('.');
-    while (parts.length) {
-        rootDomain = parts.join('.');
-        if (existsSync(join(certificatesFolder, rootDomain, certificateFile))) {
-            return rootDomain;
+    findRootDomain(domain) {
+        const parts = domain.split('/')[0].split('.');
+        const certs = this.certs;
+        while (parts.length) {
+            const rootDomain = parts.join('.');
+            if (certs[rootDomain]) {
+                return certs[rootDomain];
+            }
+            parts.shift();
         }
-        parts.shift();
+        return null;
     }
-    return '';
-}
-function setHeaders(from, to) {
-    const headers = Object.entries(from.headers);
-    for (const header of headers) {
-        to.setHeader(header[0], header[1]);
+    setHeaders(from, to) {
+        const headers = Object.entries(from.headers);
+        for (const header of headers) {
+            to.setHeader(header[0], header[1]);
+        }
     }
-}
-function handleError(error, res) {
-    console.error(error);
-    if (error.code === 'ECONNREFUSED') {
-        res.writeHead(502);
-        res.end();
-        return;
+    getOrigin(req) {
+        const host = req.headers['x-forwarded-for'] || req.headers.host || '';
+        return (host && new URL('http://' + host)) || null;
     }
-    if (!res.headersSent) {
-        res.writeHead(500);
-        res.end();
+    getHost(string) {
+        const url = new URL(string);
+        return url.hostname + (url.port ? ':' + url.port : '');
+    }
+    setCorsHeaders(req, res) {
+        const headers = req.headers;
+        const corsOrigin = new URL(req.headers.origin).origin;
+        const allowedMethod = headers['access-control-request-method'] || 'GET,HEAD,PUT,PATCH,POST,DELETE';
+        const allowedHeaders = headers['access-control-request-headers'] || '*';
+        res.setHeader('Vary', 'Origin');
+        res.setHeader('Access-Control-Allow-Origin', corsOrigin);
+        res.setHeader('Access-Control-Allow-Headers', allowedHeaders);
+        res.setHeader('Access-Control-Allow-Methods', allowedMethod);
+        res.setHeader('Access-Control-Allow-Credentials', 'true');
+    }
+    handleError(error, res) {
+        console.error(error);
+        if (error.code === 'ECONNREFUSED') {
+            res.writeHead(502);
+            res.end();
+            return;
+        }
+        if (!res.headersSent) {
+            res.writeHead(500);
+            res.end();
+        }
     }
-}
-function getOrigin(req) {
-    const host = req.headers['x-forwarded-host'] || req.headers.host || '';
-    return (host && new URL('http://' + host)) || null;
-}
-function getHost(string) {
-    const url = new URL(string);
-    return url.hostname + (url.port ? ':' + url.port : '');
-}
-function setCorsHeaders(req, res) {
-    const corsOrigin = new URL(req.headers.origin).origin;
-    res.setHeader('Vary', 'Origin');
-    res.setHeader('Access-Control-Allow-Origin', corsOrigin);
-    res.setHeader('Access-Control-Allow-Headers', '*');
-    res.setHeader('Access-Control-Allow-Methods', 'GET,HEAD,PUT,PATCH,POST,DELETE');
-    res.setHeader('Access-Control-Allow-Credentials', 'true');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/px",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "Reverse Proxy",
   "main": "dist/index.js",
   "type": "module",