add support for encrypting objects and arrays

Author: skadefro

OpenFlow/src/DBHelper.ts

@@ -1,5 +1,5 @@
 import { Crypt } from "./Crypt";
-import { User, Role, Rolemember, WellknownIds, Rights } from "openflow-api";
+import { User, Role, Rolemember, WellknownIds, Rights, NoderedUtil } from "openflow-api";
 import { Config } from "./Config";
 
 export class DBHelper {
@@ -106,7 +106,7 @@ export class DBHelper {
     public static async EnsureRole(jwt: string, name: string, id: string): Promise<Role> {
         var role: Role = await this.FindRoleByNameOrId(name, id);
         if (role !== null && (role._id === id || id === null)) { return role; }
-        if (role !== null && id !== null) { await Config.db.DeleteOne(role._id, "users", jwt); }
+        if (role !== null && !NoderedUtil.IsNullEmpty(role._id)) { await Config.db.DeleteOne(role._id, "users", jwt); }
         role = new Role(); role.name = name; role._id = id;
         role = await Config.db.InsertOne(role, "users", 0, false, jwt);
         role = Role.assign(role);

OpenFlow/src/DatabaseConnection.ts

@@ -1058,8 +1058,9 @@ export class DatabaseConnection {
      */
     private _shouldEncryptValue(keys: string[], key: string, value: object = null): boolean {
         const shouldEncryptThisKey: boolean = keys.includes(key);
-        const isString: boolean = typeof value === "string";
-        return value && shouldEncryptThisKey && isString;
+        return value && shouldEncryptThisKey;
+        // const isString: boolean = typeof value === "string";
+        // return value && shouldEncryptThisKey && isString;
     }
     /**
      * Enumerate object, encrypting fields that needs to be encrypted
@@ -1072,7 +1073,16 @@ export class DatabaseConnection {
         return (Object.keys(item).reduce((newObj, key) => {
             const value: any = item[key];
             try {
-                newObj[key] = this._shouldEncryptValue(item._encrypt, key, value) ? Crypt.encrypt(value) : value;
+                if (this._shouldEncryptValue(item._encrypt, key, (value as any))) {
+                    if (typeof value === "string") {
+                        newObj[key] = Crypt.encrypt(value);
+                    } else {
+                        var tempvalue: any = JSON.stringify(value);
+                        newObj[key] = Crypt.encrypt(tempvalue);
+                    }
+                } else {
+                    newObj[key] = value;
+                }
             } catch (err) {
                 me._logger.error("encryptentity " + err.message);
                 newObj[key] = value;
@@ -1091,7 +1101,18 @@ export class DatabaseConnection {
         return (Object.keys(item).reduce((newObj, key) => {
             const value: any = item[key];
             try {
-                newObj[key] = this._shouldEncryptValue(item._encrypt, key, value) ? Crypt.decrypt(value) : value;
+                if (this._shouldEncryptValue(item._encrypt, key, value)) {
+                    let newvalue = Crypt.decrypt(value);
+                    if (newvalue.indexOf("{") === 0 || newvalue.indexOf("[") === 0) {
+                        try {
+                            newvalue = JSON.parse(newvalue);
+                        } catch (error) {
+                        }
+                    }
+                    newObj[key] = newvalue;
+                } else {
+                    newObj[key] = value;
+                }
             } catch (err) {
                 me._logger.error("decryptentity " + err.message);
                 newObj[key] = value;

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.0.84",
+  "version": "1.0.85",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts

@@ -359,13 +359,14 @@ export class noderedcontribopenflowstorage {
                     var item: any = {
                         name: "credentials for " + Config.nodered_id,
                         credentials: credentials, credentialsarray: credentialsarray, _type: "credential", nodered_id: Config.nodered_id,
-                        _encrypt: ["credentials"]
+                        _encrypt: ["credentials", "credentialsarray"]
                     };
                     var subresult = await NoderedUtil.InsertOne("nodered", item, 1, true, null);
                 } else {
                     var item: any = result[0];
                     item.credentials = credentials;
                     item.credentialsarray = credentialsarray;
+                    item._encrypt = ["credentials", "credentialsarray"];
                     var subresult = await NoderedUtil.UpdateOne("nodered", null, item, 1, true, null);
                 }
                 this._credentials = credentials;

VERSION

@@ -1 +1 @@
-1.0.84
+1.0.85

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.0.84",
+  "version": "1.0.85",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {