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

Use lastKnownHash to handle checkpoints in the realtime channel

Browse Source
This commit is contained in:
yflory
2019-01-18 18:17:34 +01:00
parent 8dbeee1af9
commit a66d8c1384
5 changed files with 234 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
www/common/onlyoffice/main.js
View File

@@ -63,7 +63,7 @@ define([
// XXX add owners?
// owners: something...
channel: data.channel,
lastCp: data.lastCp,
lastCpHash: data.lastCpHash,
padChan: Utils.secret.channel,
validateKey: Utils.secret.keys.validateKey
}
@@ -71,18 +71,22 @@ define([
});
sframeChan.on('Q_OO_COMMAND', function (obj, cb) {
if (obj.cmd === 'SEND_MESSAGE') {
if (obj.data.isCp) {
obj.data.isCp += '|' + crypto.encrypt('cp');
} else {
obj.data.msg = crypto.encrypt(JSON.stringify(obj.data.msg));
}
obj.data.msg = crypto.encrypt(JSON.stringify(obj.data.msg));
var hash = obj.data.msg.slice(0,64);
var _cb = cb;
cb = function () {
_cb(hash);
};
}
Cryptpad.onlyoffice.execCommand(obj, cb);
});
Cryptpad.onlyoffice.onEvent.reg(function (obj) {
if (obj.ev === 'MESSAGE') {
if (obj.ev === 'MESSAGE' && !/^cp\|/.test(obj.data)) {
try {
obj.data = JSON.parse(crypto.decrypt(obj.data, Utils.secret.keys.validateKey));
obj.data = {
msg: JSON.parse(crypto.decrypt(obj.data, Utils.secret.keys.validateKey)),
hash: obj.data.slice(0,64)
};
} catch (e) {
console.error(e);
}