changes for VP and dxsync in node 4 and password encryption

Author: gsager

.gitignore

@@ -2,4 +2,5 @@ node_modules/
 .idea/
 **/npm-debug.log
 **/node_modules/**
-/build
+/build
+*.project

Gruntfile.js

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
                 files : [{
                     expand : true,
                     cwd : ".",
-                    src : ["install.cmd", "install.sh", "readme.md", "wcm-design.tar.gz", "dashboard.tar.gz", "sp-server.tar.gz", "LICENSE", "NOTICE"],
+                    src : ["install.cmd", "install.sh", "readme.md", "wcm-design.tar.gz", "dashboard.tar.gz", "dxsync-1.0.2.tar.gz", "sp-server.tar.gz", "LICENSE", "NOTICE"],
                     dest : "/",
                     filter : "isFile"
                 }]

dashboard.tar.gz

@@ -639,6 +639,11 @@ dashboardControllers.controller('AppsListController', ['$scope', '$route', '$loc
       if (server.userName && server.password) {
         args += " -portalUser " + server.userName + " -portalPassword " + server.password;
       }
+      var cPath = server.contenthandlerPath.split('/');
+      if (cPath.length > 3){
+         args += " -virtualPortalID " + cPath[3];
+      };
+
       return args;
     };
 

digexp-dashboard/js/controllers/appListController.js

@@ -116,7 +116,7 @@ function($scope) {
         }, function(err) {
             debugLogger.error(err);
             $parent.$parent.loadingNewLibraries--;
-            $parent.$parent.$apply(function(){$scope.status = 'Error Pulling Library ' + library.title;});
+            window.alert('Error Pulling Library ' + library.title + ' ' + err);
             $parent.$apply();
             debugLogger.log("Error adding " + library.title);
         });

digexp-dashboard/js/controllers/listWcmDesignsController.js

@@ -23,6 +23,7 @@ var dashConfig = (function(){
   };
 
   return {
+    clearConfig: function() {configInfo = "";},
     getConfigInfo: function (){
       // Read base config first, then get any overrides from user-settings.json
       if(configInfo == ""){
@@ -33,6 +34,12 @@ var dashConfig = (function(){
           var data = fs.readFileSync('./user-settings.json', 'utf8');
           var userConfig = JSON.parse(data);
           // Copy settings
+          userConfig.servers.forEach(function(server){
+              if(server.password)
+              var nPwd = decrypt( server.password );
+                if(nPwd.length != 0)
+                    server.password = nPwd;
+          });
           copyObj(configInfo, userConfig);
         }
       }
@@ -44,6 +51,10 @@ var dashConfig = (function(){
       fs.exists("./dashboard-config.json", function (exists) {
         if (exists) {
           copyObj(configInfo, newConfig);
+          configInfo.servers.forEach(function(server){
+              if(server.password)
+                server.password = encrypt( server.password );
+          });
           fs.writeFile("./dashboard-config.json", JSON.stringify(configInfo, null, '  '));
         }
       });
@@ -68,7 +79,13 @@ var dashConfig = (function(){
             rVal = configInfo.spAppServer;
             break;
         case this.tools.dxTheme:
-            rVal = configInfo.dxThemeServer;
+            var serverInfo = {};
+            copyObj(serverInfo, this.getServerInfo(configInfo.dxThemeServer));
+            var cPath = serverInfo.contenthandlerPath.split('/');
+            if (cPath.length > 3){
+                serverInfo.contenthandlerPath = '/' + cPath[1] + '/' + cPath[2];
+            };
+            return serverInfo;
             break;
         case this.tools.wcmDesigns:
             rVal = configInfo.wcmDesignsServer;

digexp-dashboard/js/dashConfig.js

@@ -22,7 +22,7 @@ var settings = (function() {
           configInfo.servers.push({});
           configInfo.servers[count].name = (document.querySelector("#serverName"+ count) || {}).value;
           configInfo.servers[count].userName = (document.querySelector("#userName"+ count) || {}).value;
-          configInfo.servers[count].password = (document.querySelector("#password"+ count) || {}).value;
+          configInfo.servers[count].password = encrypt((document.querySelector("#password"+ count) || {}).value);
           configInfo.servers[count].host = (document.querySelector("#host"+count) || {}).value;
           configInfo.servers[count].port = (document.querySelector("#port"+count) || {}).value;
           configInfo.servers[count].secure = (document.querySelector("#secure"+count) || {}).checked;
@@ -35,7 +35,7 @@ var settings = (function() {
 
       // update user-settings.json
       fs.writeFileSync('./user-settings.json', JSON.stringify(configInfo, null, 4));
-
+      dashConfig.clearConfig();
     },
     setSettings: function(newSettings) {
       var configInfo = dashConfig.getConfigInfo();

digexp-dashboard/js/settings.js

@@ -8,6 +8,8 @@
  * specific language governing permissions and limitations under the License.
  */
 var tracer = require("tracer"),
+    algorithm = "aes-256-ctr",
+    password = "U6Jv]H[tf;mxE}6t*PQz?j474A7T@Vx%gcVJA#2cr2GNh96ve+",
     debugEnvironmentVar = process.env.DIGEXP_DEBUG || '',
     debugNames = debugEnvironmentVar.toUpperCase().split(','),
     debugFunctions = {};
@@ -31,6 +33,22 @@ function debugLogger(moduleName) {
     return debugFunctions[moduleName];
 };
 
+function encrypt( text ) {
+    var crypto =  require('crypto');
+    var cipher = crypto.createCipher( algorithm, password );
+    var crypted = cipher.update( text, "utf8", "hex" );
+    crypted += cipher.final( "hex" );
+    return crypted;
+}
+
+function decrypt( text ) {
+    var crypto =  require('crypto');
+    var decipher = crypto.createDecipher( algorithm, password );
+    var dec = decipher.update( text, "hex", "utf8" );
+    dec += decipher.final( "utf8" );
+    return dec;
+}
+
 var getModified = function(dirName, dateString, ignore, callback){
     // takes the name of the directory you want to find the modified and a string for a date that is the toLocaleString of a date object
     // 
@@ -97,4 +115,6 @@ utils.copyProperties = function(a, b) {
 };
 
 utils.debugLogger = debugLogger;
+utils.encrypt = encrypt;
+utils.decrypt = decrypt;
 

digexp-dashboard/js/utils.js

@@ -44,7 +44,7 @@ var rm_rf = function(path, cb) {
 
 console.log("Installing dxsync:");
 
-ch.exec("npm install https://github.com/digexp/dxsync/archive/1.0.2.tar.gz --no-optional",
+ch.exec("npm install https://github.com/OpenNTF/WebDevToolkitForDx/blob/master/dxsync-1.0.2.tar?raw=true --no-optional",
   function(err) {
     if (err) {
       console.error("Error installing dxsync: " + err.message);

digexp-dashboard/postinstall.js

@@ -477,7 +477,7 @@ var globalPassword = '';
 var authCookie = null;
 
 var init = function(host, port, user, password, contentHandlerPath) {
-    debugLogger.trace('init:: host::' + host + ' port::' + port + ' user::' + user + ' password::' + password + ' contentHandlerPath::' + contentHandlerPath);
+    debugLogger.trace('init:: host::' + host + ' port::' + port + ' user::' + user + ' contentHandlerPath::' + contentHandlerPath);
     var deferred = Q.defer(), initialize = function(contentHandlerPath) {
         var pathComponents = contentHandlerPath.split('/');
         // for vitrula portals the last component is the portal context if