KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-02-14 13:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed authentication issue with chat

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-06 11:37:46 +02:00
parent 417c928b77
commit 60a7610a28
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/js/chat.js
View File

@@ -68,7 +68,7 @@ var Chat = {
else if($(".chat-tab-li a.active").attr("href") == "#all_chat") else if($(".chat-tab-li a.active").attr("href") == "#all_chat")
socket.emit("all,chat", data.value); socket.emit("all,chat", data.value);
else else
socket.emit("chat", {channel: chan.toLowerCase(), data: data.value}); socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
data.value = ""; data.value = "";
return; return;
}, },

4
server/server.js
View File

@@ -281,13 +281,13 @@ io.on('connection', function(socket){
}); });
socket.on('chat', function (msg) { socket.on('chat', function (msg) {
if(typeof(data) !== 'object' && !msg.hasOwnProperty('data') && !msg.hasOwnProperty('channel')) { if(typeof(data) !== 'object' && !msg.hasOwnProperty('data') && !msg.hasOwnProperty('channel') && !msg.hasOwnProperty('pass')) {
socket.emit('update_required'); socket.emit('update_required');
return; return;
} }
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (msg.hasOwnProperty('pass') && docs[0].userpass == decrypt_string(socketid, msg.pass)))) { if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (msg.hasOwnProperty('pass') && docs[0].userpass == decrypt_string(socketid, msg.pass)))) {
var data = msg.data;
check_inlist(coll, guid, socket, names[guid], offline); check_inlist(coll, guid, socket, names[guid], offline);
if(data !== "" && data !== undefined && data !== null && if(data !== "" && data !== undefined && data !== null &&
data.length < 151 && data.replace(/\s/g, '').length){ data.length < 151 && data.replace(/\s/g, '').length){