github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-04 12:16:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5949 from overleaf/tm-doc-rev-nan-errors

Browse source 
Add error for if doc revision is NaN when we check revs

GitOrigin-RevId: 22149c506c9fe1604c76e92b40ac23aca6c40f81
This commit is contained in:
Thomas 2021-11-30 11:27:53 +01:00 committed by Copybot
parent 2e3f56c0d4
commit 7bcc585465
3 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/docstore/app/js/Errors.js
View file

@ -6,8 +6,11 @@ class Md5MismatchError extends OError {}
class DocModifiedError extends OError {}
class DocRevValueError extends OError {}
module.exports = {
Md5MismatchError,
DocModifiedError,
DocRevValueError,
...Errors,
}

9
services/docstore/app/js/MongoManager.js
View file

@ -203,6 +203,15 @@ module.exports = MongoManager = {
if (err) return callback(err)
MongoManager.getDocRev(doc._id, function (err, currentRev) {
if (err) return callback(err)
if (isNaN(currentRev) || isNaN(doc.rev)) {
return callback(
new Errors.DocRevValueError('doc rev is NaN', {
doc_id: doc._id,
rev: doc.rev,
currentRev,
})
)
}
if (doc.rev !== currentRev) {
return callback(
new Errors.DocModifiedError('doc rev has changed', {

25
services/docstore/test/unit/js/MongoManagerTests.js
View file

@ -371,5 +371,30 @@ describe('MongoManager', function () {
}
)
})
it('should return a value error if incoming rev is NaN', function (done) {
this.db.docs.findOne = sinon.stub().callsArgWith(2, null, { rev: 2 })
this.doc = { _id: ObjectId(), name: 'mock-doc', rev: NaN }
this.MongoManager.withRevCheck(
this.doc,
this.testFunction,
(err, result) => {
err.should.be.instanceof(Errors.DocRevValueError)
done()
}
)
})
it('should return a value error if checked doc rev is NaN', function (done) {
this.db.docs.findOne = sinon.stub().callsArgWith(2, null, { rev: NaN })
this.MongoManager.withRevCheck(
this.doc,
this.testFunction,
(err, result) => {
err.should.be.instanceof(Errors.DocRevValueError)
done()
}
)
})
})
})