elasticio-sailor-nodejs 2.7.5 → 2.7.6-dev.2

package/.nsprc

@@ -1,18 +1,6 @@
 {
-    "GHSA-wc69-rhjr-hc9g": {
-         "active": true,
-         "notes": "Bunyan library set only new Date to momentjs as parameter"
-    },
     "GHSA-f8q6-p94x-37v3": {
         "active": true,
         "notes": "braceExpand is not used in rimraf"
-    },
-    "GHSA-hrpp-h998-j3pp": {
-        "active": true,
-        "notes": "There is no query-string user input in sailor"
-    },
-    "GHSA-27h2-hvpr-p74q": {
-        "active": true,
-        "notes": "The vulnerability is in maester-client. Maester-client doesn't use jwt.verify function."
     }
 }

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.7.6 (August 1, 2025)
+
+* Updated `elasticio-rest-node` to version 2.0.0 to address a vulnerability
+* Removed `request` related libraries from main dependencies
+
 ## 2.7.5 (March 21, 2025)
 
 * @elastic.io/maester-client updated to 6.0.0 to get rid of the vulnerability

package/lib/hooksData.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('requestretry');
+const { axiosReqWithRetryOnServerError } = require('elasticio-rest-node');
 
 class HooksData {
 
@@ -25,22 +25,20 @@ class HooksData {
             url: `${this.basePath}/sailor-support/hooks/task/${this.taskId}/startup/data`,
             method,
             auth: {
-                user: this.user,
-                pass: this.pass
+                username: this.user,
+                password: this.pass
             },
-            json: true,
-            forever: true,
             headers: {
                 Connection: 'Keep-Alive'
             },
-            maxAttempts: this.maxAttempts,
-            retryDelay: this.retryDelay,
-            retryStrategy: request.RetryStrategies.HTTPOrNetworkError
+            data,
+            validateStatus: (status) => (status >= 200 && status < 500)
         };
-        if (data) {
-            options.body = data;
-        }
-        const { statusCode, body } = await request(options);
+        const config = {
+            retriesCount: this.maxAttempts,
+            retryDelay: this.retryDelay
+        };
+        const { statusCode, body } = await axiosReqWithRetryOnServerError(options, config);
 
         if (statusCode >= 400) {
             throw Object.assign(new Error(body.error), { statusCode });

package/lib/service.js

@@ -1,12 +1,12 @@
 const Q = require('q');
 const _ = require('lodash');
 const assert = require('assert');
-const request = require('requestretry');
 const util = require('util');
 const ComponentReader = require('./component_reader').ComponentReader;
 const EventEmitter = require('events').EventEmitter;
 const debug = require('debug')('sailor');
 const RestApiClient = require('elasticio-rest-node');
+const { axiosReqWithRetryOnServerError } = require('elasticio-rest-node');
 const log = require('./logging');
 const { ComponentLogger } = log;
 
@@ -130,25 +130,34 @@ function processService(serviceMethod, env) {
     }
 
     function sendResponse(responseBody) {
-        var opts = {
+        const opts = {
             url: POST_RESULT_URL,
-            json: true,
-            forever: true,
+            method: 'POST',
             headers: {
                 Connection: 'Keep-Alive'
             },
-            rejectUnauthorized: false,
-            body: responseBody,
-            simple: false,
-            maxAttempts: parseInt(env.ELASTICIO_API_REQUEST_RETRY_ATTEMPTS),
-            retryDelay: parseInt(env.ELASTICIO_API_REQUEST_RETRY_DELAY),
-            retryStrategy: request.RetryStrategies.HTTPOrNetworkError,
-            fullResponse: true
+            data: responseBody,
+            validateStatus: (status) => (status >= 200 && status < 500)
+        };
+        const parsedUrl = new URL(POST_RESULT_URL);
+        if (parsedUrl.username && parsedUrl.password) {
+            opts.auth = {
+                username: decodeURIComponent(parsedUrl.username),
+                password: decodeURIComponent(parsedUrl.password)
+            };
+            parsedUrl.username = '';
+            parsedUrl.password = '';
+            opts.url = parsedUrl.toString();
+        }
+
+        const config = {
+            retriesCount: parseInt(env.ELASTICIO_API_REQUEST_RETRY_ATTEMPTS),
+            retryDelay: parseInt(env.ELASTICIO_API_REQUEST_RETRY_DELAY)
         };
 
         debug('About to send response back to the API');
 
-        return request.post(opts)
+        return axiosReqWithRetryOnServerError(opts, config)
             .then(checkStatusCode)
             .then(() => responseBody);
 

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": "2.7.5",
+  "version": "2.7.6-dev.2",
   "main": "run.js",
   "scripts": {
     "audit": "better-npm-audit audit --level high --production",
@@ -21,13 +21,11 @@
     "bunyan": "1.8.10",
     "co": "4.6.0",
     "debug": "3.1.0",
-    "elasticio-rest-node": "1.2.7",
+    "elasticio-rest-node": "2.0.0-dev.3",
     "event-to-promise": "0.8.0",
     "lodash": "4.17.21",
     "p-throttle": "2.1.0",
     "q": "1.5.1",
-    "request-promise-native": "1.0.5",
-    "requestretry": "7.0.2",
     "uuid": "3.0.1"
   },
   "devDependencies": {
@@ -45,6 +43,7 @@
     "nock": "12.0.3",
     "rabbitmq-stats": "1.2.4",
     "request": "2.88.0",
+    "request-promise-native": "1.0.5",
     "sinon": "9.0.2",
     "sinon-chai": "3.5.0"
   },