@cloud-cli/px 3.4.2 → 3.5.0

package/README.md

@@ -83,8 +83,10 @@ CORS handling on proxy level is convenient, **but a security risk**. Beware:
 - All origins are allowed, all common methods and headers, and credentials are enabled.
 - In case of an `OPTIONS` request, if coming via CORS (a preflight), an empty response will be send and the request ends before calling the proxied target.
 
-Every request has 2 additional headers:
+Every request has additional headers:
 
 - x-forwarded-for: the host of the original request.
 If a proxy is from 'https://foo.example.com' to 'http://localhost:1234', the header will be 'foo.example.com'
-- x-forwarded-proto: 'http:' or 'https:', depends on the original request
+- x-forwarded-proto: 'http' or 'https', depends on the original request
+- forwarded: the standard header with the same information as the other two above
+

package/dist/proxy-manager.d.ts

@@ -1,6 +1,7 @@
 import { ProxyEntry } from './proxy.js';
 export interface Domain {
     domain: string;
+    host?: string;
 }
 export interface DomainAndTarget extends Domain {
     target: string;
@@ -12,8 +13,12 @@ type ClassProperties<T> = {
     [K in KeysOf<T>]: T[K] extends never ? never : T[K];
 };
 export declare class ProxyManager {
-    addProxy(proxy: ClassProperties<ProxyEntry>): Promise<unknown>;
-    updateProxy(options: ClassProperties<ProxyEntry>): Promise<boolean>;
+    addProxy(proxy: ClassProperties<ProxyEntry> & {
+        host?: string;
+    }): Promise<unknown>;
+    updateProxy(options: ClassProperties<ProxyEntry> & {
+        host?: string;
+    }): Promise<boolean>;
     removeProxy(options: DomainAndTarget): Promise<unknown>;
     getDomainList(): Promise<string[]>;
     getProxyList(): Promise<ProxyEntry[]>;

package/dist/proxy-manager.js

@@ -5,14 +5,14 @@ const targetNotSpecifiedError = new Error('Target not specified');
 export class ProxyManager {
     addProxy(proxy) {
         return new Promise(async (resolve, reject) => {
-            if (!proxy.domain) {
+            if (!proxy.domain && !proxy.host) {
                 return reject(domainNotSpecifiedError);
             }
             if (!proxy.target && !proxy.redirectUrl) {
                 return reject(targetNotSpecifiedError);
             }
             const entry = new ProxyEntry({
-                domain: proxy.domain,
+                domain: proxy.domain || proxy.host,
                 target: proxy.target,
                 cors: !!proxy.cors,
                 redirect: !!proxy.redirect,
@@ -29,7 +29,7 @@ export class ProxyManager {
         });
     }
     async updateProxy(options) {
-        const query = new Query().where('domain').is(options.domain);
+        const query = new Query().where('domain').is(options.domain || options.host);
         const proxies = await Resource.find(ProxyEntry, query);
         if (!proxies.length) {
             return false;
@@ -42,10 +42,10 @@ export class ProxyManager {
     }
     removeProxy(options) {
         return new Promise(async (resolve, reject) => {
-            if (!options.domain) {
+            if (!options.domain && !options.host) {
                 return reject(domainNotSpecifiedError);
             }
-            const query = new Query().where('domain').is(options.domain);
+            const query = new Query().where('domain').is(options.domain || options.host);
             if (options.target) {
                 query.where('target').is(options.target);
             }
@@ -69,6 +69,6 @@ export class ProxyManager {
         return Resource.find(ProxyEntry, new Query());
     }
     getProxyListForDomain(options) {
-        return Resource.find(ProxyEntry, new Query().where('domain').is(options.domain));
+        return Resource.find(ProxyEntry, new Query().where('domain').is(options.domain || options.host));
     }
 }

package/dist/proxy.js

@@ -113,7 +113,7 @@ export class ProxyServer {
         proxyRequest.setHeader('host', this.getHost(target));
         proxyRequest.setHeader('x-forwarded-for', req.headers.host);
         proxyRequest.setHeader('x-forwarded-proto', insecure ? 'http' : 'https');
-        proxyRequest.setHeader('forwarded', 'host=' + req.headers.host + ';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) => this.handleError(error, res));

package/package.json

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