web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 'isNewChannel'

Browse Source
This commit is contained in:
ansuz 2019-08-14 17:34:08 +02:00
parent 9498669ffe
commit 6a5ab1ff87
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpc.js
View File

@ -1475,8 +1475,10 @@ var removeLoginBlock = function (Env, msg, cb) {
}); });
}; };
// FIXME METADATA var ARRAY_LINE = /^\[/;
// since we're changing how metadata works this can lead to false positives // since we're changing how metadata works this can lead to false positives
// XXX rewrite this such that we can abort once we have a conclusive answer
var isNewChannel = function (Env, channel, cb) { var isNewChannel = function (Env, channel, cb) {
if (!isValidId(channel)) { return void cb('INVALID_CHAN'); } if (!isValidId(channel)) { return void cb('INVALID_CHAN'); }
if (channel.length !== 32) { return void cb('INVALID_CHAN'); } if (channel.length !== 32) { return void cb('INVALID_CHAN'); }
@ -1487,6 +1489,12 @@ var isNewChannel = function (Env, channel, cb) {
if (done) { return; } if (done) { return; }
var parsed; var parsed;
try { try {
if (count === 0 && typeof(msg) === 'string' && ARRAY_LINE.test(msg)) {
done = true;
count++;
return void cb(void 0, false);
}
parsed = JSON.parse(msg); parsed = JSON.parse(msg);
if (parsed && typeof(parsed) === 'object') { count++; } if (parsed && typeof(parsed) === 'object') { count++; }
if (count >= 2) { if (count >= 2) {