Merge branch 'master' into gdpr

Author: ar2rsawseen

bin/commands/scripts/user_mgmt.js

@@ -9,6 +9,11 @@ function sha1Hash(str, addSalt) {
     return crypto.createHmac('sha1', salt + "").update(str + "").digest('hex');
 }
 
+function sha512Hash(str, addSalt) {
+    var salt = (addSalt) ? new Date().getTime() : "";
+    return crypto.createHmac('sha512', salt + "").update(str + "").digest('hex');
+}
+
 function md5Hash(str) {
     return crypto.createHash('md5').update(str + "").digest('hex');
 }
@@ -20,7 +25,7 @@ if(myArgs[0] == "register" && myArgs[1] && myArgs[2]){
             db.close();
         }
         else{
-            var doc = {"full_name":myArgs[1], "username":myArgs[1], "password":sha1Hash(myArgs[2]), "email":myArgs[1], "global_admin":true};
+            var doc = {"full_name":myArgs[1], "username":myArgs[1], "password":sha512Hash(myArgs[2]), "email":myArgs[1], "global_admin":true};
             db.collection('members').insert(doc, {safe:true}, function (err, member) {
                 if(err){
                     console.log(err);
@@ -41,7 +46,7 @@ if(myArgs[0] == "register" && myArgs[1] && myArgs[2]){
     });
 }
 else if(myArgs[0] == "delete" && myArgs[1] && myArgs[2]){
-    db.collection('members').remove({username:myArgs[1], password:sha1Hash(myArgs[2])}, function (err, member) {
+    db.collection('members').remove({$and : [{username:myArgs[1]}, {$or: [{"password":sha512Hash(myArgs[2])}, {"password" : sha1Hash(myArgs[2])}]}]}, function (err, member) {
         if(err)
             console.log(err);
         else