mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-09 08:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

ensure targetRev is limited to headRev for CHANGESET_REQs

Browse source
This commit is contained in:
webzwo0i 2023-06-25 23:33:15 +02:00
parent f4c3fd5a73
commit 6ae7b14051
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/node/handler/PadMessageHandler.js
View file

@ -1082,6 +1082,9 @@ const handleChangesetRequest = async (socket, {data: {granularity, start, reques
const end = start + (100 * granularity);
const {padId, author: authorId} = sessioninfos[socket.id];
const pad = await padManager.getPad(padId, null, authorId);
const headRev = pad.getHeadRevisionNumber();
if (start > headRev)
start = headRev;
const data = await getChangesetInfo(pad, start, end, granularity);
data.requestID = requestID;
socket.json.send({type: 'CHANGESET_REQ', data});

27
src/tests/backend/specs/messages.js
View file

@ -133,6 +133,33 @@ describe(__filename, function () {
await otherPad.remove();
}
});
it('CHANGESET_REQ: revNum 2 is converted to head rev 1 (regression)', async function () {
const otherPadId = `${padId}other`;
assert(!await padManager.doesPadExist(otherPadId));
const otherPad = await padManager.getPad(otherPadId, 'other text\n');
try {
await otherPad.setText('other text\n');
const resP = common.waitForSocketEvent(roSocket, 'message');
await common.sendMessage(roSocket, {
component: 'pad',
padId: otherPadId, // The server should ignore this.
type: 'CHANGESET_REQ',
data: {
granularity: 1,
start: '2',
requestID: 'requestId',
},
});
const res = await resP;
assert.equal(res.type, 'CHANGESET_REQ');
assert.equal(res.data.requestID, 'requestId');
assert.equal(res.data.start, 1);
}
finally {
await otherPad.remove();
}
});
});
describe('USER_CHANGES', function () {