@codefresh-io/service-base 3.0.18 → 3.0.20

package/index.js

@@ -10,14 +10,14 @@ const {
 } = require('@codefresh-io/http-infra');
 const Promise = require('bluebird');
 const express = require('express');
-const monitor = require('cf-monitor');
+const monitor = require('@codefresh-io/cf-monitor');
 const logging = require('./infra/logging');
 const { openapi } = require('@codefresh-io/cf-openapi');
 
 const OPTIONAL_COMPONENTS = {
     mongo: { name: 'mongoClient' },
-    redis: { },
-    eventbus: { },
+    redis: {},
+    eventbus: {},
     encryption: { dependencies: ['mongo'] },
 };
 

package/infra/encryption/safe.js

@@ -51,11 +51,18 @@ Safe.prototype.read_crypto = function (ciphertext) { // eslint-disable-line
     const iv = Buffer.alloc(16, this.safeModel.key);
 
     const shouldParse = ciphertext.startsWith(STRINGIFY_CRYPTO_PREFIX);
-    const prefixLength = (shouldParse ? STRINGIFY_CRYPTO_PREFIX : CRYPTO_PREFIX).length;
+    const prefix = shouldParse ? STRINGIFY_CRYPTO_PREFIX : CRYPTO_PREFIX;
+
+    // don't try to encrypt empty strings
+    // this causes segfault with node.js >= 14.x.x
+    if (ciphertext === CRYPTO_PREFIX) {
+        deferred.resolve('');
+        return deferred.promise;
+    }
 
     const encrypt = 0; // 0 = Decrypt
     cryptoAsync.cipher(
-        ALGORITHM, encrypt, key, iv, Buffer.from(ciphertext.slice(prefixLength), 'hex'),
+        ALGORITHM, encrypt, key, iv, Buffer.from(ciphertext.slice(prefix.length), 'hex'),
         (error, plaintext) => {
             if (error) {
                 deferred.reject(error);
@@ -75,8 +82,16 @@ Safe.prototype.write_crypto = function (plaintext) { // eslint-disable-line
     const iv = Buffer.alloc(16, this.safeModel.key);
 
     const shouldStringify = !_.isString(plaintext);
+    const prefix = shouldStringify ? STRINGIFY_CRYPTO_PREFIX : CRYPTO_PREFIX;
     const textToEncrypt = shouldStringify ? JSON.stringify(plaintext) : plaintext;
 
+    // don't try to encrypt empty strings
+    // this causes segfault with node.js >= 14.x.x
+    if (textToEncrypt === '') {
+        deferred.resolve(prefix);
+        return deferred.promise;
+    }
+
     const encrypt = 1; // 1 = Encrypt
     cryptoAsync.cipher(
         ALGORITHM, encrypt, key, iv, Buffer.from(textToEncrypt),
@@ -85,7 +100,7 @@ Safe.prototype.write_crypto = function (plaintext) { // eslint-disable-line
                 deferred.reject(error);
                 return;
             }
-            deferred.resolve(`${shouldStringify ? STRINGIFY_CRYPTO_PREFIX : CRYPTO_PREFIX}${ciphertext.toString('hex')}`);
+            deferred.resolve(`${prefix}${ciphertext.toString('hex')}`);
         },
     );
     return deferred.promise;

package/infra/encryption/safe.unit.spec.js

@@ -65,13 +65,15 @@ const STRINGIFY_CRYPTO_PREFIX = '$$$crypto-obj$$$';
     it('should encrypt all object', () => {
       const objToEncrypt = {
         keyToBeEncrypted: 'value-1',
-        keyToBeEncrypted2: 'value-2'
+        keyToBeEncrypted2: 'value-2',
+        keyToBeEncrypted3: '',
       };
       const keysToEncrypt = Object.keys(objToEncrypt);
       return encryptObjectValues(generateSafeId(), objToEncrypt, keysToEncrypt)
         .then((res) => {
           expect(res.keyToBeEncrypted).to.have.string(CRYPTO_PREFIX);
           expect(res.keyToBeEncrypted2).to.have.string(CRYPTO_PREFIX);
+          expect(res.keyToBeEncrypted3).to.equal(CRYPTO_PREFIX);
         });
     });
 
@@ -125,7 +127,8 @@ const STRINGIFY_CRYPTO_PREFIX = '$$$crypto-obj$$$';
     it('should decrypt encrypted object', () => {
       const objToEncrypt = {
         keyToBeEncrypted: 'value-1',
-        keyToBeEncrypted2: 'value-2'
+        keyToBeEncrypted2: 'value-2',
+        keyToBeEncrypted3: '', // should be decrypted as empty string
       };
       const keysToEncrypt = Object.keys(objToEncrypt);
       return encryptObjectValues(generateSafeId(), objToEncrypt, keysToEncrypt)
@@ -133,7 +136,9 @@ const STRINGIFY_CRYPTO_PREFIX = '$$$crypto-obj$$$';
           return decryptObjectValues(generateSafeId(), res, keysToEncrypt);
         })
         .then((decrypted) => {
-          expect(decrypted).to.be.deep.equal(objToEncrypt);
+            expect(decrypted.keyToBeEncrypted).to.be.deep.equal(objToEncrypt.keyToBeEncrypted);
+            expect(decrypted.keyToBeEncrypted2).to.be.deep.equal(objToEncrypt.keyToBeEncrypted2);
+            expect(decrypted.keyToBeEncrypted3).to.be.equal('');
         });
     });
 

package/infra/eventbus.js

@@ -2,7 +2,7 @@
 
 const Promise = require('bluebird');
 const eventBus = require('@codefresh-io/eventbus');
-const monitor = require('cf-monitor');
+const monitor = require('@codefresh-io/cf-monitor');
 const CFError = require('cf-errors');
 
 class Eventbus {

package/infra/express.js

@@ -6,7 +6,7 @@ const bodyParser = require('body-parser');
 const methodOverride = require('method-override');
 const cookieParser = require('cookie-parser');
 const morgan = require('morgan');
-const monitor = require('cf-monitor');
+const monitor = require('@codefresh-io/cf-monitor');
 const { newDomainMiddleware } = require('@codefresh-io/http-infra');
 const { openapi } = require('@codefresh-io/cf-openapi');
 const CFError = require('cf-errors');

package/infra/index.js

@@ -1,6 +1,6 @@
 
 
-const monitor = require('cf-monitor');
+const monitor = require('@codefresh-io/cf-monitor');
 
 monitor.init();
 const Promise = require('bluebird'); // jshint ignore:line

package/infra/redis.js

@@ -1,7 +1,7 @@
 
 
 const Promise = require('bluebird');
-const monitor = require('cf-monitor');
+const monitor = require('@codefresh-io/cf-monitor');
 const redis = require('redis');
 
 class Redis {

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "3.0.18",
+  "version": "3.0.20",
   "main": "index.js",
   "description": "",
-  "engines": {
-    "node": ">=8.9.4"
-  },
   "bin": {
     "cf-openapi": "./node_modules/cf-openapi/bin/cf-openapi"
   },
@@ -31,6 +28,7 @@
   "homepage": "https://github.com/codefresh-io/service-base#readme",
   "dependencies": {
     "@codefresh-io/authenticated-entity": "^2.13.1",
+    "@codefresh-io/cf-monitor": "^0.0.24",
     "@codefresh-io/cf-openapi": "~0.7.13",
     "@codefresh-io/eventbus": "1.4.2",
     "@codefresh-io/http-infra": "^1.8.11",
@@ -42,7 +40,6 @@
     "body-parser": "^1.18.3",
     "cf-errors": "^0.1.15",
     "cf-logs": "^1.1.24",
-    "cf-monitor": "git+https://github.com/codefresh-io/cf-monitor.git#fc6b49d2a1a161beaf6d33b692d4ca86b38dfe43",
     "chai": "^4.1.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.4",

package/yarn.lock

@@ -286,6 +286,13 @@
     lodash "^4.17.21"
     semver "^7.0.0"
 
+"@codefresh-io/cf-monitor@^0.0.24":
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/cf-monitor/-/cf-monitor-0.0.24.tgz#9c85f93c05bac6ba3a91385f8428270d9903ac23"
+  integrity sha512-hnp4DRjx/yAHi9Y7KlcZLAVTEO4emzd8JvXV26gMIONQ7QSWc17YxeXh5xL926Nx8EMh2Xol5soDAQ+sc/zuhg==
+  dependencies:
+    newrelic "^8.0.0"
+
 "@codefresh-io/cf-openapi@~0.7.13":
   version "0.7.13"
   resolved "https://registry.yarnpkg.com/@codefresh-io/cf-openapi/-/cf-openapi-0.7.13.tgz#ad763ee99ef770c4ed88b2efe5e9c9dda7d9f993"
@@ -352,9 +359,9 @@
     kuler "^2.0.0"
 
 "@grpc/grpc-js@^1.5.5":
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.11.tgz#74c04cde0cde4e8a88ffc514bd9cd1bb307815b9"
-  integrity sha512-e/adiPjUxf5cKYiAlV4m+0jJS4k6g2w78X7WTZB3ISOBzcCwm+cwjB2dSRfBHbu46inGGzQMmWAmsgYLg8yT5g==
+  version "1.6.12"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.12.tgz#20f710d8a8c5c396b2ae9530ba6c06b984614fdf"
+  integrity sha512-JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw==
   dependencies:
     "@grpc/proto-loader" "^0.7.0"
     "@types/node" ">=12.12.47"
@@ -1455,12 +1462,6 @@ cf-logs@^1.1.24, cf-logs@^1.1.25:
     lodash "^4.17.21"
     winston "3.3.3"
 
-"cf-monitor@git+https://github.com/codefresh-io/cf-monitor.git#fc6b49d2a1a161beaf6d33b692d4ca86b38dfe43":
-  version "0.0.22"
-  resolved "git+https://github.com/codefresh-io/cf-monitor.git#fc6b49d2a1a161beaf6d33b692d4ca86b38dfe43"
-  dependencies:
-    newrelic "^8.0.0"
-
 chai@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
@@ -5047,19 +5048,19 @@ readable-stream@^2.3.5, readable-stream@^2.3.7:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.2, readable-stream@^3.1.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+readable-stream@^3.1.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"