infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax

pull/1/head
ansuz 2016-03-25 18:01:51 +01:00
parent e26246178f b372b0b77c
commit e3b78e20de
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/chainpad.js
View File

@ -1043,12 +1043,18 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
authDocAtTimeOfPatch = Patch.apply(toApply[i].content, authDocAtTimeOfPatch);
}
if (Sha.hex_sha256(authDocAtTimeOfPatch) !== patch.parentHash) {
var authDocHashAtTimeOfPatch = Sha.hex_sha256(authDocAtTimeOfPatch);
if (authDocHashAtTimeOfPatch !== patch.parentHash) {
debug(realtime, "patch [" + msg.hashOf + "] parentHash is not valid");
if (Common.PARANOIA) { check(realtime); }
//delete realtime.messages[msg.hashOf];
return;
}
if (authDocAtTimeOfPatch === realtime.authDoc &&
authDocHashAtTimeOfPatch !== realtime.best.inverseOf.parentHash)
{
throw new Error("authDoc does not match chain head");
}
var simplePatch =
Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);