KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/disable-chat

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-27 12:08:20 +02:00
parent 510ba13b32 c0864b3311
commit 2117f839ac
9 changed files with 148 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/handlers/functions.js
View File

@@ -236,6 +236,7 @@ function contains(a, obj) {
}
function hash_pass(adminpass, hex) {
if(adminpass == undefined || adminpass == "") return "";
if(hex) return crypto.createHash('sha256').update(adminpass).digest('hex');
return crypto.createHash('sha256').update(adminpass).digest('base64');
}
@@ -247,7 +248,7 @@ function setSessionAdminPass(id, adminpass, list, callback) {
return;
}
connected_db.collection(id).update({_id: list}, {$set: {adminpass: adminpass}}, {upsert: true}, function(e, d){
connected_db.collection(id).update({_id: list}, {$set: {adminpass: hash_pass(decrypt_string(adminpass), true)}}, {upsert: true}, function(e, d){
callback();
return;
});
@@ -262,7 +263,6 @@ function setSessionChatPass(id, name, pass, callback) {
callback();
return;
}
connected_db.collection(id).update({_id: "_chat_"}, {$set: {password: pass, name: name}}, {upsert: true}, function(e) {
callback();
return;
@@ -317,10 +317,11 @@ function setChromecastHost(id, other_id, list, callback) {
function setSessionUserPass(id, userpass, list, callback) {
try {
if(id == "empty" || id == undefined) {
if(id == "empty" || id == undefined || userpass == undefined) {
callback();
return;
}
connected_db.collection(id).update({_id: list}, {$set: {userpass: userpass}}, {upsert: true}, function(e, d){
callback();
return;
@@ -373,7 +374,7 @@ function removeSessionAdminPass(id, channel, callback) {
callback();
return;
}
connected_db.collection(id).remove({_id: channel}, function() {
connected_db.collection(id).update({_id: channel}, {$set: {"adminpass": ""}}, function() {
callback();
return;
});