Merge branch 'develop' into master

Author: dbusel

scripts/postinstall.js

@@ -10,7 +10,7 @@
  *  *******************************************************************************
  *  
  */
-
+const sqlite3 = require('sqlite3');//.verbose(); //use verbose in dev to get stack traces
 const os = require('os');
 const execSync = require('child_process').execSync;
 const fs = require('fs');
@@ -64,7 +64,7 @@ try {
 
   fs.unlinkSync(installationVariablesFile);
 } catch (e) {
-  console.log('no previous version')
+  console.log('no previous version');
 }
 
 //init db
@@ -102,52 +102,46 @@ function moveFileIfExists(from, to) {
 
 function insertSeeds() {
   console.log('    inserting seeds meta info in db');
-  const options = {
-    env: {
-      "PATH": process.env.PATH
-    },
-    stdio: [process.stdin, process.stdout, process.stderr]
-  };
-
-  execSync(`sqlite3 ${prodDb} "insert into SequelizeMeta (name) values ('20180928110125-insert-registry.js');"`, options);
-  execSync(`sqlite3 ${prodDb} "insert into SequelizeMeta (name) values ('20180928111532-insert-catalog-item.js');"`, options);
-  execSync(`sqlite3 ${prodDb} "insert into SequelizeMeta (name) values ('20180928112152-insert-iofog-type.js');"`, options);
-  execSync(`sqlite3 ${prodDb} "insert into SequelizeMeta (name) values ('20180928121334-insert-catalog-item-image.js');"`, options);
+  const sqlite3ProdDb = new sqlite3.Database(prodDb);
+  const seeds = [
+    '20180928110125-insert-registry.js',
+    '20180928111532-insert-catalog-item.js',
+    '20180928112152-insert-iofog-type.js',
+    '20180928121334-insert-catalog-item-image.js'
+  ];
+  sqlite3ProdDb.serialize(function() {
+    const stmt = sqlite3ProdDb.prepare("INSERT INTO SequelizeMeta (name) VALUES (?)");
+    seeds.map(s => stmt.run(s));
+    stmt.finalize();
+  });
+  sqlite3ProdDb.close();
 }
 
 function updateEncryptionMethodForUsersPassword(decryptionFunc) {
-  const options = {
-    env: {
-      "PATH": process.env.PATH
-    }
-  };
-
-  const usersOutput = execSync(`sqlite3 ${prodDb} "select id, email, password from Users;"`, options).toString();
-  const usersLines = usersOutput.match(/[^\r\n]+/g);
-  for (let line of usersLines) {
-    let id, email, oldEncryptedPassword;
-    try {
-      const vals = line.split('|');
-      id = vals[0];
-      email = vals[1];
-      oldEncryptedPassword = vals[2];
-
-      const decryptedPassword = decryptionFunc(oldEncryptedPassword, email);
-
-      const AppHelper = require('../src/helpers/app-helper');
-      const newEncryptedPassword = AppHelper.encryptText(decryptedPassword, email);
-
-      const options = {
-        env: {
-          "PATH": process.env.PATH
-        },
-        stdio: [process.stdin, process.stdout, process.stderr]
-      };
-      execSync(`sqlite3 ${prodDb} "update Users set password='${newEncryptedPassword}' where id=${id};"`, options);
-    } catch (e) {
-      console.log('db problem');
-    }
-  }
+  console.log('    updating encryption in DB');
+  const sqlite3ProdDb = new sqlite3.Database(prodDb);
+  sqlite3ProdDb.all('select id, email, password from Users', function(err, rows) {
+    const stmt = sqlite3ProdDb.prepare('update Users set password=? where id=?');
+
+    rows.map(user => {
+      try {
+        const id = user.id;
+        const email = user.email;
+        const oldEncryptedPassword = user.password;
+
+        const decryptedPassword = decryptionFunc(oldEncryptedPassword, email);
+        const AppHelper = require('../src/helpers/app-helper');
+        const newEncryptedPassword = AppHelper.encryptText(decryptedPassword, email);
+
+        stmt.run(newEncryptedPassword, id);
+      } catch (e) {
+        console.log('db problem');
+        console.log(e);
+      }
+    });
+    stmt.finalize();
+  });
+  sqlite3ProdDb.close();
 }
 
 function updateEncryptionMethodForEmailService(configFile, decryptionFunc) {
@@ -191,6 +185,7 @@ function updateEncryptionMethod() {
   }
 
   updateEncryptionMethodForUsersPassword(decryptTextVer30);
+  console.log('    updating encryption  for email services in configs');
   updateEncryptionMethodForEmailService(defConfig, decryptTextVer30);
   updateEncryptionMethodForEmailService(devConfig, decryptTextVer30);
   updateEncryptionMethodForEmailService(prodConfig, decryptTextVer30);

src/cli/iofog.js

@@ -354,7 +354,7 @@ async function _getHalHardwareInfo(obj) {
     if (data.hasOwnProperty('info')) {
       data.info = JSON.parse(data.info);
     }
-
+    
     logger.info(JSON.stringify(data, null, 2));
   }
 

src/services/microservices-service.js

@@ -128,9 +128,11 @@ async function updateMicroservice(microserviceUuid, microserviceData, user, isCL
       userId: user.id
     };
 
+  const config = _validateMicroserviceConfig(microserviceData.config);
+
   const microserviceToUpdate = {
     name: microserviceData.name,
-    config: microserviceData.config,
+    config: config,
     rebuild: microserviceData.rebuild,
     iofogUuid: microserviceData.iofogUuid,
     rootHostAccess: microserviceData.rootHostAccess,
@@ -481,12 +483,20 @@ async function listVolumeMappings(microserviceUuid, user, isCLI, transaction) {
   return await VolumeMappingManager.findAll(volumeMappingWhere, transaction);
 }
 
+// this function works with escape and unescape config, in case of unescaped config, the first split will not work,
+// but the second will work
+function _validateMicroserviceConfig(config) {
+  return config.split('\\"').join('"').split('"').join('\"');
+}
+
 async function _createMicroservice(microserviceData, user, isCLI, transaction) {
 
+  const config = _validateMicroserviceConfig(microserviceData.config);
+
   let newMicroservice = {
     uuid: AppHelper.generateRandomString(32),
     name: microserviceData.name,
-    config: microserviceData.config,
+    config: config,
     catalogItemId: microserviceData.catalogItemId,
     flowId: microserviceData.flowId,
     iofogUuid: microserviceData.iofogUuid,

test/src/services/iofog-service.test.js

@@ -814,7 +814,6 @@ describe('ioFog Service', () => {
             return expect($subject).to.be.rejectedWith(error);
           })
         });
-        
         context('when ChangeTrackingService#update() succeeds', () => {
           it('fulfills the promise', () => {
             return expect($subject).to.eventually.equal(undefined);