@codefresh-io/service-base 4.0.5 → 4.0.7

package/infra/encryption/safe.js

@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const Promise = require('bluebird');
 const uuid = require('node-uuid');
-const cryptoAsync = require('@ronomon/crypto-async');
+const crypto = require('crypto');
 
 const config = require('../config');
 const mongoClient = require('../mongo');
@@ -12,6 +12,19 @@ const ALGORITHM = 'AES-256-CTR';
 const CRYPTO_PREFIX = '$$$crypto$$$';
 const STRINGIFY_CRYPTO_PREFIX = '$$$crypto-obj$$$';
 
+async function cipher(algorithm, encrypt, key, iv, data) {
+    if (encrypt) {
+        const cipherObject = crypto.createCipheriv(algorithm, key, iv);
+        let ciphertext = cipherObject.update(data, 'utf8', 'hex');
+        ciphertext += cipherObject.final('hex');
+        return ciphertext;
+    }
+    const decipher = crypto.createDecipheriv(algorithm, key, iv);
+    let plaintext = decipher.update(data, 'hex', 'utf8');
+    plaintext += decipher.final('utf8');
+    return plaintext;
+}
+
 const Safe = function (safeModel) { // eslint-disable-line
     this.safeModel = safeModel;
 };
@@ -61,17 +74,14 @@ Safe.prototype.read_crypto = function (ciphertext) { // eslint-disable-line
     }
 
     const encrypt = 0; // 0 = Decrypt
-    cryptoAsync.cipher(
-        ALGORITHM, encrypt, key, iv, Buffer.from(ciphertext.slice(prefix.length), 'hex'),
-        (error, plaintext) => {
-            if (error) {
-                deferred.reject(error);
-                return;
-            }
-            const ret = plaintext.toString();
-            deferred.resolve(shouldParse ? JSON.parse(ret) : ret);
-        },
-    );
+    cipher(ALGORITHM, encrypt, key, iv, Buffer.from(ciphertext.slice(prefix.length), 'hex')).then((plaintext) => {
+        const ret = plaintext.toString();
+        deferred.resolve(shouldParse ? JSON.parse(ret) : ret);
+    }).catch((error) => {
+        if (error) {
+            deferred.reject(error);
+        }
+    });
     return deferred.promise;
 };
 
@@ -93,16 +103,13 @@ Safe.prototype.write_crypto = function (plaintext) { // eslint-disable-line
     }
 
     const encrypt = 1; // 1 = Encrypt
-    cryptoAsync.cipher(
-        ALGORITHM, encrypt, key, iv, Buffer.from(textToEncrypt),
-        (error, ciphertext) => {
-            if (error) {
-                deferred.reject(error);
-                return;
-            }
-            deferred.resolve(`${prefix}${ciphertext.toString('hex')}`);
-        },
-    );
+    cipher(ALGORITHM, encrypt, key, iv, Buffer.from(textToEncrypt)).then((ciphertext) => {
+        deferred.resolve(`${prefix}${ciphertext.toString('hex')}`);
+    }).catch((error) => {
+        if (error) {
+            deferred.reject(error);
+        }
+    });
     return deferred.promise;
 };
 

package/infra/mongo.js

@@ -22,10 +22,9 @@ class Mongo {
 
         const logger = require('cf-logs').Logger('codefresh:infra:mongo'); // eslint-disable-line
         this.logger = logger;
-        logger.info(`Mongo got config ${JSON.stringify(config.mongo)}`);
+
         const { uri } = config.mongo;
         const dbName = config.mongo.dbName || getDbNameFromUri(uri);
-        logger.info(`Use Uri ${uri} settings ${JSON.stringify(clientSettings)}, the dbName is ${dbName}`);
         return MongoClient.connect(uri, clientSettings)
             .then(async (client) => {
                 this.client = client;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/service-base",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "main": "index.js",
   "description": "",
   "bin": {
@@ -30,12 +30,11 @@
   "homepage": "https://github.com/codefresh-io/service-base#readme",
   "dependencies": {
     "@codefresh-io/authenticated-entity": "^2.17.1",
-    "@codefresh-io/cf-monitor": "^0.0.27",
+    "@codefresh-io/cf-monitor": "^0.0.29",
     "@codefresh-io/cf-openapi": "^0.7.20",
     "@codefresh-io/eventbus": "^2.0.0",
     "@codefresh-io/http-infra": "^1.8.15",
     "@codefresh-io/internal-service-config": "^1.0.3",
-    "@ronomon/crypto-async": "^5.0.1",
     "@wegolook/joi-objectid": "^2.4.0",
     "ajv": "^6.10.0",
     "bluebird": "^3.5.3",