elasticio-sailor-nodejs 3.0.0-sailor-proxy-dev15 → 3.0.0-sailor-proxy-dev16

package/config/local.json

@@ -7,7 +7,7 @@
     "ELASTICIO_WORKSPACE_ID": "69b26526c4796609ca0da128",
     "ELASTICIO_USER_ID": "69b26526c4796609ca0da127",
     "ELASTICIO_COMP_ID": "69b26526c4796609ca0da126",
-    "ELASTICIO_FUNCTION": "data_trigger",
+    "ELASTICIO_FUNCTION": "rebound_trigger",
     "ELASTICIO_API_URI": "http://localhost:9000",
     "ELASTICIO_API_USERNAME": "task-692ee23d4ab5d34bb7321559",
     "ELASTICIO_API_KEY": "976ffec8-455b-494e-9478-2d66761f4040",
@@ -15,5 +15,7 @@
     "ELASTICIO_MESSAGE_CRYPTO_PASSWORD": "password",
     "ELASTICIO_SAILOR_PROXY_URI": "http://localhost:4001",
     "ELASTICIO_COMPONENT_PATH": "./spec/component",
-    "ELASTICIO_EMIT_LIGHTWEIGHT_MESSAGE": "true"
+    "ELASTICIO_EMIT_LIGHTWEIGHT_MESSAGE": "true",
+    "ELASTICIO_SAILOR_PROXY_JWT_SECRET": "super-secret-proxy"
+
 }

package/lib/proxy-client.js

@@ -7,6 +7,7 @@ const http2 = require('http2');
 const { getJitteredDelay } = require('./utils.js');
 const { Promise } = require('q');
 const pThrottle = require('p-throttle');
+const { sign } = require('jsonwebtoken');
 
 const {
     HTTP2_HEADER_PATH,
@@ -42,7 +43,21 @@ class ProxyClient {
         if (!username || !password) {
             throw new Error('API_USERNAME and API_KEY must be set to connect to Sailor Proxy');
         }
-        this.authHeader = 'Basic ' + Buffer.from(`${username}:${password}`).toString('base64');
+        const proxySecret = settings.SAILOR_PROXY_JWT_SECRET;
+        if (!proxySecret) {
+            throw new Error('SAILOR_PROXY_JWT_SECRET must be set to connect to Sailor Proxy');
+        }
+        this.proxyJWT = sign({
+            username,
+            password,
+            stepId: settings.STEP_ID,
+            execId: settings.EXEC_ID,
+            containerId: settings.CONTAINER_ID,
+            workspaceId: settings.WORKSPACE_ID,
+            userId: settings.USER_ID,
+            compId: settings.COMP_ID,
+            function: settings.FUNCTION
+        }, proxySecret);
 
         this.throttles = {
             // 100 Messages per Second
@@ -321,7 +336,7 @@ class ProxyClient {
             const getObjectStream = this.clientSession.request({
                 [HTTP2_HEADER_PATH]: `/object/${objectId}`,
                 [HTTP2_HEADER_METHOD]: 'GET',
-                [HTTP2_HEADER_AUTHORIZATION]: this.authHeader
+                [HTTP2_HEADER_AUTHORIZATION]: this.proxyJWT
             }).pipe(this._encryptor.createDecipher());
 
             const chunks = [];
@@ -353,7 +368,7 @@ class ProxyClient {
             const postMessageStream = this.clientSession.request({
                 [HTTP2_HEADER_PATH]: '/object',
                 [HTTP2_HEADER_METHOD]: 'POST',
-                [HTTP2_HEADER_AUTHORIZATION]: this.authHeader
+                [HTTP2_HEADER_AUTHORIZATION]: this.proxyJWT
             });
 
             let responseData = '';
@@ -404,20 +419,18 @@ class ProxyClient {
                 log.debug('Starting to listen for messages from proxy');
                 await this._ensureConnection();
 
-                const stepId = this.settings.STEP_ID;
                 const prefetch = this.settings.PROXY_PREFETCH_SAILOR;
                 // TODO: When prefetch > 1, what if one message takes a long time to process - do we want to wait for it before requesting the next one?
                 await Promise.all(new Array(prefetch).fill().map(async () => {
                     const queryParams = new URLSearchParams({
-                        stepId,
                         prefetch
                     }).toString();
-                    log.info({ stepId, prefetch }, 'Requesting message from proxy');
+                    log.info({ prefetch }, 'Requesting message from proxy');
                     // TODO: what timeout is here? e.g. when flow is realtime - we might need to wait a long time...
                     const getMessageStream = this.clientSession.request({
                         [HTTP2_HEADER_PATH]: `/message?${queryParams}`,
                         [HTTP2_HEADER_METHOD]: 'GET',
-                        [HTTP2_HEADER_AUTHORIZATION]: this.authHeader
+                        [HTTP2_HEADER_AUTHORIZATION]: this.proxyJWT
                     });
                     this.getMessageStreams.add(getMessageStream);
 
@@ -509,13 +522,13 @@ class ProxyClient {
             messageId: metadata.messageId || uuid.v4()
         };
         let preparedData = data;
-        if (preparedData.headers) {
+        if (preparedData && preparedData.headers) {
             preparedData.headers = _.omitBy(
                 preparedData.headers,
                 (value, key) => key.toLowerCase() === HEADER_ROUTING_KEY
             );
         }
-        if (protocolVersion) {
+        if (protocolVersion && data) {
             preparedData = this.encryptMessageContent(data, protocolVersion);
             preparedMetadata.protocolVersion = protocolVersion;
         }
@@ -540,7 +553,7 @@ class ProxyClient {
             await throttledSend();
         }
 
-        const messageHeaders = _.mapKeys(data.headers || {}, (value, key) => key.toLowerCase());
+        const messageHeaders = data && data.headers ? _.mapKeys(data.headers, (value, key) => key.toLowerCase()) : {};
         const customRoutingKey = messageHeaders[HEADER_ROUTING_KEY];
 
         log.debug({
@@ -552,17 +565,16 @@ class ProxyClient {
         }, 'Sending message to proxy');
         log.trace({ data }, 'Message data to send to proxy');
         const { preparedMetadata, preparedData } = this._prepareData(data, metadata, type, forceProtocolVersion);
-        if (preparedData.length > this.settings.OUTGOING_MESSAGE_SIZE_LIMIT) {
+        if (preparedData && preparedData.length > this.settings.OUTGOING_MESSAGE_SIZE_LIMIT) {
             const error = new Error(`Outgoing message size ${preparedData.length}` +
                 ` exceeds limit of ${this.settings.OUTGOING_MESSAGE_SIZE_LIMIT}.`);
             log.error(error);
             throw error;
         }
-        log.debug({ preparedMetadata, preparedDataSize: preparedData.length }, 'Prepared message for sending to proxy');
+        log.debug({ preparedMetadata, preparedDataSize: preparedData ? preparedData.length : null }, 'Prepared message for sending to proxy');
 
         const queryParams = new URLSearchParams({
             incomingMessageId,
-            stepId: this.settings.STEP_ID,
             type,
             ...(customRoutingKey ? { customRoutingKey } : {})
         }).toString();
@@ -570,10 +582,12 @@ class ProxyClient {
             const postMessageStream = this.clientSession.request({
                 [HTTP2_HEADER_PATH]: `/message?${queryParams}`,
                 [HTTP2_HEADER_METHOD]: 'POST',
-                [HTTP2_HEADER_AUTHORIZATION]: this.authHeader,
+                [HTTP2_HEADER_AUTHORIZATION]: this.proxyJWT,
                 [MESSAGE_METADATA_QUERY_PARAM]: JSON.stringify(preparedMetadata)
             });
-            postMessageStream.write(preparedData);
+            if (preparedData) {
+                postMessageStream.write(preparedData);
+            }
             postMessageStream.end();
 
             postMessageStream.on('response', (headers) => {
@@ -653,7 +667,7 @@ class ProxyClient {
             const postMessageStream = this.clientSession.request({
                 [HTTP2_HEADER_PATH]: `/finish-processing?${queryParams}`,
                 [HTTP2_HEADER_METHOD]: 'POST',
-                [HTTP2_HEADER_AUTHORIZATION]: this.authHeader
+                [HTTP2_HEADER_AUTHORIZATION]: this.proxyJWT
             });
             postMessageStream.end();
 
@@ -700,6 +714,7 @@ class ProxyClient {
             error: encryptedError
         };
         if (originalMessage) {
+            // No idea what is going on here - simply copied from previos implementation
             const protocolVersion = Number(metadata.protocolVersion || 1);
             if (protocolVersion >= 2) {
                 payload.errorInput = this._encryptor.encryptMessageContent(
@@ -707,8 +722,10 @@ class ProxyClient {
                     'base64'
                 ).toString();
             } else {
-                // TODO: encrypt errorInput
-                payload.errorInput = originalMessage;
+                payload.errorInput = this.encryptMessageContent(
+                    originalMessage,
+                    metadata.protocolVersion
+                );
             }
         }
         const errorPayload = JSON.stringify(payload);
@@ -731,8 +748,7 @@ class ProxyClient {
         return this.sendMessage({
             type: 'rebound',
             metadata: outgoingMetadata,
-            incomingMessageId: metadata ? metadata.messageId : undefined,
-            data: reboundError
+            incomingMessageId: metadata ? metadata.messageId : undefined
         });
     }
 

package/lib/settings.js

@@ -87,7 +87,8 @@ function getMandatoryEnvVars(envVars) {
 
         'API_URI',
         'API_USERNAME',
-        'API_KEY'
+        'API_KEY',
+        'SAILOR_PROXY_JWT_SECRET'
     ];
 
     const requiredForMessageProcessing = [

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "elasticio-sailor-nodejs",
     "description": "The official elastic.io library for bootstrapping and executing for Node.js connectors",
-    "version": "3.0.0-sailor-proxy-dev15",
+    "version": "3.0.0-sailor-proxy-dev16",
     "main": "run.js",
     "scripts": {
         "build": "tsc",
@@ -23,6 +23,7 @@
         "debug": "3.1.0",
         "elasticio-rest-node": "2.0.0",
         "event-to-promise": "0.8.0",
+        "jsonwebtoken": "^9.0.3",
         "lodash": "4.17.21",
         "p-throttle": "2.1.0",
         "q": "1.5.1",
@@ -33,7 +34,6 @@
         "chai": "4.2.0",
         "del": "2.2.2",
         "eslint": "6.2.2",
-        "eslint-plugin-mocha": "4.12.1",
         "eslint-config-standard": "14.1.0",
         "eslint-plugin-import": "2.20.1",
         "eslint-plugin-mocha": "6.3.0",