2.0.1

.gitlab-ci.yml

@@ -1,18 +1,16 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-variables:
-  GIT_STRATEGY: clone
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -20,21 +18,23 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -43,37 +43,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci command npm run build
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -83,33 +86,35 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:18-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -117,5 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -1,5 +1,6 @@
 {
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartproxy",
-  "version": "1.0.31",
+  "version": "2.0.1",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist/index.js",
@@ -14,29 +14,31 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^12.7.8",
+    "@types/node": "^13.7.0",
-    "tslint": "^5.20.0",
+    "tslint": "^6.0.0",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartnetwork": "^1.1.14",
+    "@pushrocks/lik": "^3.0.16",
-    "@pushrocks/smartpromise": "^3.0.5",
+    "@pushrocks/smartnetwork": "^1.1.18",
-    "@pushrocks/smartrequest": "^1.1.35",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartrequest": "^1.1.47",
     "@pushrocks/smartspawn": "^2.0.9",
+    "@pushrocks/smartstring": "^3.0.18",
     "@pushrocks/smartsystem": "^2.0.9",
-    "@tsclass/tsclass": "^2.0.6",
+    "@tsclass/tsclass": "^3.0.3",
-    "@types/ws": "^6.0.3",
+    "@types/ws": "^7.2.1",
-    "ws": "^7.1.2"
+    "ws": "^7.2.1"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_web/**/*",
-    "dist_ts_web/*",
+    "dist_ts_web/**/*",
-    "assets/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ a proxy for handling high workloads of proxying
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartproxy/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartproxy/badges/master/build.svg)](https://gitlab.com/pushrocks/smartproxy/commits/master)
+[![pipeline status](https://gitlab.com/pushrocks/smartproxy/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/smartproxy/commits/master)
 [![coverage report](https://gitlab.com/pushrocks/smartproxy/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartproxy/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartproxy.svg)](https://www.npmjs.com/package/@pushrocks/smartproxy)
 [![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartproxy/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartproxy)
@@ -18,6 +18,11 @@ a proxy for handling high workloads of proxying
 
 ## Usage
 
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -4,7 +4,7 @@ import * as smartproxy from '../ts/index';
 let testProxy: smartproxy.SmartProxy;
 
 tap.test('first test', async () => {
-  testProxy = new smartproxy.SmartProxy();
+  testProxy = new smartproxy.SmartProxy({});
 });
 
 tap.test('should start the testproxy', async () => {
@@ -12,11 +12,12 @@ tap.test('should start the testproxy', async () => {
 });
 
 tap.test('should supply reverse proxy config', async () => {
-  testProxy.updateReversConfigs([{
+  testProxy.updateReverseConfigs([
-    destinationIp: 'localhost',
+    {
-    destinationPort: '3000',
+      destinationIp: 'localhost',
-    hostName: 'central.eu',
+      destinationPort: '3000',
-    privateKey: `-----BEGIN PRIVATE KEY-----
+      hostName: 'push.rocks',
+      privateKey: `-----BEGIN PRIVATE KEY-----
 MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
 3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
 kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
@@ -69,7 +70,7 @@ h+7fBVO49PLL0NWy+8GT8y7a04calFfLvZEA2UMaunBis3dE1KMFfJL/0JO+sKnF
 2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
 -----END PRIVATE KEY-----
     `,
-    publicKey: `-----BEGIN CERTIFICATE-----
+      publicKey: `-----BEGIN CERTIFICATE-----
 MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
 RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
@@ -97,11 +98,12 @@ r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
 JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
     `
-  }]);
+    }
+  ]);
 });
 
 tap.test('should wait for 60 seconds', async tools => {
-  await tools.delayFor(60000);
+  await tools.delayFor(10000);
 });
 
 tap.test('should close the testproxy', async () => {

ts/smartproxy.classes.proxyworker.ts

@@ -7,13 +7,21 @@ export class ProxyWorker {
   public httpsServer: plugins.https.Server; // | plugins.http.Server;
   public port = 8001;
   public router = new SmartproxyRouter();
+  public socketMap = new plugins.lik.Objectmap<plugins.net.Socket>();
 
   /**
    * starts the proxyInstance
    */
   public async start() {
-    this.httpsServer = plugins.https.createServer({
+    this.httpsServer = plugins.https.createServer(
-      key: `-----BEGIN PRIVATE KEY-----
+      // ================
+      // Spotted this keypair in the code?
+      // Don't get exited:
+      // It is an invalid default keypair.
+      // For proper requests custom domain level keypairs are used that are provided in the reverse config
+      // ================
+      {
+        key: `-----BEGIN PRIVATE KEY-----
 MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDi2F/0kQr96mhe
 3yEWvy2mRHOZoSSBtIqg6Bre4ZcMu901/cHNIjFnynNGFl9Se61yZbW2F3PfCt7+
 kQlHug1Cx+LFssvz+hLlB5cqJQZfRKx92DhbROygtxG9r7UBmx/fwx+JQ+HOHX9R
@@ -66,7 +74,7 @@ h+7fBVO49PLL0NWy+8GT8y7a04calFfLvZEA2UMaunBis3dE1KMFfJL/0JO+sKnF
 2TkK01XDDJURK5Lhuvc7WrK2rSJ/fK+0GA==
 -----END PRIVATE KEY-----
     `,
-    cert: `-----BEGIN CERTIFICATE-----
+        cert: `-----BEGIN CERTIFICATE-----
 MIIEljCCAn4CCQDY+ZbC9FASVjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJE
 RTAeFw0xOTA5MjAxNjAxNDRaFw0yMDA5MTkxNjAxNDRaMA0xCzAJBgNVBAYTAkRF
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4thf9JEK/epoXt8hFr8t
@@ -94,46 +102,89 @@ r8d9QwrK+WaqVi2ofbMfMByVF72jgeJNa4nxwT9bVbu/Q1T2Lt+YPb4pQ7yCoUgS
 JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
 -----END CERTIFICATE-----
     `
-    }, async (req, res) => {
+      },
-      console.log('got request');
+      async (req, res) => {
-      const destinationConfig = this.router.routeReq(req);
+        console.log('got request');
-      let destinationUrl: string;
+        const destinationConfig = this.router.routeReq(req);
-      if (destinationConfig) {
+
-        destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
+        // endRequest function
-      } else {
+        const endRequest = (
-        res.writeHead(404);
+          statusArg: number = 404,
-        res.end('This route is not available on this server\n');
+          messageArg: string = 'This route is not available on this server.',
-        return;
+          headers: plugins.http.OutgoingHttpHeaders = {}
-      }
+        ) => {
-      console.log(destinationUrl);
+          res.writeHead(statusArg, messageArg);
-      const response = await plugins.smartrequest.request(
+          res.end(messageArg);
-        destinationUrl,
+        };
-        {
+
-          method: req.method,
+        // authentication
-          headers: req.headers
+        if (destinationConfig.authentication) {
-        },
+          const authInfo = destinationConfig.authentication;
-        true, // lets make this streaming
+          switch (authInfo.type) {
-        (request) => {
+            case 'Basic':
-          req.on('data', data => {
+              const authHeader = req.headers.authorization;
-            request.write(data);
+              if (authHeader) {
-          });
+                if (!authHeader.includes('Basic ')) {
-          req.on('end', data => {
+                  return endRequest(401, 'Authentication required', {
-            request.end();
+                    'WWW-Authenticate': 'Basic realm="Access to the staging site", charset="UTF-8"'
-          });
+                  });
+                }
+                const authStringBase64 = req.headers.authorization.replace('Basic ', '');
+                const authString: string = plugins.smartstring.base64.decode(authStringBase64);
+                const userPassArray = authString.split(':');
+                const user = userPassArray[0];
+                const pass = userPassArray[1];
+                if (user === authInfo.user && pass === authInfo.pass) {
+                  console.log('request successfully authenticated');
+                } else {
+                  return endRequest(403, 'Forbidden: Wrong credentials');
+                }
+              }
+              break;
+            default:
+              return endRequest(
+                403,
+                'Forbidden: unsupported authentication method configured. Please report to the admin.'
+              );
+          }
         }
-      );
+
-      res.statusCode = response.statusCode;
+        let destinationUrl: string;
-      console.log(response.statusCode);
+        if (destinationConfig) {
-      for (const header of Object.keys(response.headers)) {
+          destinationUrl = `http://${destinationConfig.destinationIp}:${destinationConfig.destinationPort}${req.url}`;
-        res.setHeader(header, response.headers[header]);
+        } else {
+          return endRequest();
+        }
+        console.log(destinationUrl);
+        const response = await plugins.smartrequest.request(
+          destinationUrl,
+          {
+            method: req.method,
+            headers: req.headers
+          },
+          true, // lets make this streaming
+          request => {
+            req.on('data', data => {
+              request.write(data);
+            });
+            req.on('end', data => {
+              request.end();
+            });
+          }
+        );
+        res.statusCode = response.statusCode;
+        console.log(response.statusCode);
+        for (const header of Object.keys(response.headers)) {
+          res.setHeader(header, response.headers[header]);
+        }
+        response.on('data', data => {
+          res.write(data);
+        });
+        response.on('end', () => {
+          res.end();
+        });
       }
-      response.on('data', data => {
+    );
-        res.write(data);
-      });
-      response.on('end', () => {
-        res.end();
-      });
-    });
 
     // Enable websockets
     const wss = new plugins.ws.Server({ server: this.httpsServer });
@@ -168,18 +219,26 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     });
     this.httpsServer.keepAliveTimeout = 61000;
     this.httpsServer.headersTimeout = 65000;
+
+    this.httpsServer.on('connection', connection => {
+      this.socketMap.add(connection);
+      connection.on('close', () => {
+        this.socketMap.remove(connection);
+      });
+    });
+
     this.httpsServer.listen(this.port);
-    console.log(`OK: now listening for new connections on port ${this.port}`);
+    console.log(`ProxyWorker -> OK: now listening for new connections on port ${this.port}`);
   }
 
-  public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.IReverseProxyConfig[]) {
+  public async updateProxyConfigs(proxyConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]) {
     this.proxyConfigs = proxyConfigsArg;
     this.router.setNewProxyConfigs(proxyConfigsArg);
     for (const hostCandidate of this.proxyConfigs) {
       // console.log(hostCandidate);
       this.httpsServer.addContext(hostCandidate.hostName, {
         cert: hostCandidate.publicKey,
-        key: hostCandidate.privateKey,
+        key: hostCandidate.privateKey
       });
     }
     /* this.httpsServer.close();
@@ -191,6 +250,9 @@ JNj2Dr5H0XoLFFnvuvzcRbhlJ9J67JzR+7g=
     this.httpsServer.close(() => {
       done.resolve();
     });
+    await this.socketMap.forEach(async socket => {
+      socket.destroy();
+    });
     await done.promise;
   }
 }

ts/smartproxy.classes.smartproxy.ts

@@ -3,13 +3,23 @@ import * as plugins from './smartproxy.plugins';
 import { TProxyWorkerCalls } from './smartproxy.classes.proxyworker';
 import { TPortProxyCalls } from './smartproxy.portproxy';
 
+export interface ISmartProxyOptions {
+  port?: number;
+}
+
 export class SmartProxy {
   public smartsystem = new plugins.smartsystem.Smartsystem();
   public reverseConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];
   public proxyWorkerFunctions: plugins.smartspawn.ModuleThread<TProxyWorkerCalls>;
   public portProxyFunctions: plugins.smartspawn.ModuleThread<TPortProxyCalls>;
 
-  public async updateReversConfigs(
+  public options: ISmartProxyOptions;
+
+  constructor(optionsArg: ISmartProxyOptions = {}) {
+    this.options = optionsArg;
+  }
+
+  public async updateReverseConfigs(
     reverseConfigsArg: plugins.tsclass.network.IReverseProxyConfig[]
   ) {
     // TODO search for old hostCandidates with that target
@@ -28,6 +38,8 @@ export class SmartProxy {
     this.portProxyFunctions = await plugins.smartspawn.spawn<TPortProxyCalls>(
       new plugins.smartspawn.Worker('./smartproxy.portproxy')
     );
+
+    await this.portProxyFunctions.start(this.options.port);
     await this.proxyWorkerFunctions.start();
 
     console.log('successfully spawned portproxy and proxyworkers!');

ts/smartproxy.plugins.ts

@@ -1,9 +1,10 @@
 // node native scope
 import * as http from 'http';
 import * as https from 'https';
+import * as net from 'net';
 import * as url from 'url';
 
-export { http, https, url };
+export { http, https, net, url };
 
 // tsclass scope
 import * as tsclass from '@tsclass/tsclass';
@@ -11,12 +12,14 @@ import * as tsclass from '@tsclass/tsclass';
 export { tsclass };
 
 // pushrocks scope
+import * as lik from '@pushrocks/lik';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartspawn from '@pushrocks/smartspawn';
+import * as smartstring from '@pushrocks/smartstring';
 import * as smartsystem from '@pushrocks/smartsystem';
 
-export { smartrequest, smartpromise, smartspawn, smartsystem };
+export { lik, smartrequest, smartpromise, smartspawn, smartstring, smartsystem };
 
 // third party scope
 import * as ws from 'ws';

ts/smartproxy.portproxy.ts

@@ -1,22 +1,42 @@
 import * as plugins from './smartproxy.plugins';
 import { expose } from '@pushrocks/smartspawn';
 import * as net from 'net';
-const server = net
+let netServer: plugins.net.Server;
-  .createServer(from => {
+let httpServer: plugins.http.Server;
-    const to = net.createConnection({
-      host: 'localhost',
-      port: 8001
-    });
-    from.pipe(to);
-    to.pipe(from);
-  })
-  .listen(8000);
 
 const portProxyCalls = {
+  start: async (portArg = 8000) => {
+    httpServer = plugins.http.createServer((request, response) => {
+      
+      const requestUrl = new URL(request.url, `http://${request.headers.host}`);
+      const completeUrlWithoutProtocol = `${requestUrl.host}${requestUrl.pathname}${requestUrl.search}`;
+      const redirectUrl = `https://${completeUrlWithoutProtocol}`;
+      console.log(`Got http request for http://${completeUrlWithoutProtocol}`);
+      console.log(`Redirecting to ${redirectUrl}`);
+      response.writeHead(302, {
+        'Location': redirectUrl
+      });
+      response.end();
+    });
+    httpServer.listen(7999);
+    netServer = net
+      .createServer(from => {
+        const to = net.createConnection({
+          host: 'localhost',
+          port: 8001
+        });
+        from.pipe(to);
+        to.pipe(from);
+      })
+      .listen(portArg);
+    console.log(`PortProxy -> OK: Now listening on port ${portArg}`);
+  },
   stop: async () => {
     const done = plugins.smartpromise.defer();
-    server.close(() => {
+    httpServer.close(() => {
-      done.resolve();
+      netServer.close(() => {
+        done.resolve();
+      });
     });
     await done.promise;
   }