mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Do a naive check for null bytes after JSON.stringify on doc lines
This commit is contained in:
parent
1ce51c45bf
commit
60f3393c44
2 changed files with 53 additions and 20 deletions
|
@ -31,6 +31,8 @@ module.exports = RedisManager =
|
||||||
timer.done()
|
timer.done()
|
||||||
_callback(error)
|
_callback(error)
|
||||||
docLines = JSON.stringify(docLines)
|
docLines = JSON.stringify(docLines)
|
||||||
|
if docLines.indexOf("\u0000") != -1
|
||||||
|
return callback(new Error("null bytes found in doc lines"))
|
||||||
docHash = RedisManager._computeHash(docLines)
|
docHash = RedisManager._computeHash(docLines)
|
||||||
logger.log project_id:project_id, doc_id:doc_id, version: version, hash:docHash, "putting doc in redis"
|
logger.log project_id:project_id, doc_id:doc_id, version: version, hash:docHash, "putting doc in redis"
|
||||||
ranges = RedisManager._serializeRanges(ranges)
|
ranges = RedisManager._serializeRanges(ranges)
|
||||||
|
@ -151,6 +153,8 @@ module.exports = RedisManager =
|
||||||
jsonOps = appliedOps.map (op) -> JSON.stringify op
|
jsonOps = appliedOps.map (op) -> JSON.stringify op
|
||||||
multi = rclient.multi()
|
multi = rclient.multi()
|
||||||
newDocLines = JSON.stringify(docLines)
|
newDocLines = JSON.stringify(docLines)
|
||||||
|
if newDocLines.indexOf("\u0000") != -1
|
||||||
|
return callback(new Error("null bytes found in doc lines"))
|
||||||
newHash = RedisManager._computeHash(newDocLines)
|
newHash = RedisManager._computeHash(newDocLines)
|
||||||
multi.eval setScript, 1, keys.docLines(doc_id:doc_id), newDocLines
|
multi.eval setScript, 1, keys.docLines(doc_id:doc_id), newDocLines
|
||||||
multi.set keys.docVersion(doc_id:doc_id), newVersion
|
multi.set keys.docVersion(doc_id:doc_id), newVersion
|
||||||
|
|
|
@ -12,7 +12,8 @@ describe "RedisManager", ->
|
||||||
auth: () ->
|
auth: () ->
|
||||||
exec: sinon.stub()
|
exec: sinon.stub()
|
||||||
@rclient.multi = () => @rclient
|
@rclient.multi = () => @rclient
|
||||||
@RedisManager = SandboxedModule.require modulePath, requires:
|
@RedisManager = SandboxedModule.require modulePath,
|
||||||
|
requires:
|
||||||
"./RedisBackend":
|
"./RedisBackend":
|
||||||
createClient: () => @rclient
|
createClient: () => @rclient
|
||||||
"./RedisKeyBuilder":
|
"./RedisKeyBuilder":
|
||||||
|
@ -32,6 +33,9 @@ describe "RedisManager", ->
|
||||||
Timer: class Timer
|
Timer: class Timer
|
||||||
done: () ->
|
done: () ->
|
||||||
"./Errors": Errors
|
"./Errors": Errors
|
||||||
|
globals:
|
||||||
|
JSON: @JSON = JSON
|
||||||
|
|
||||||
@doc_id = "doc-id-123"
|
@doc_id = "doc-id-123"
|
||||||
@project_id = "project-id-123"
|
@project_id = "project-id-123"
|
||||||
@callback = sinon.stub()
|
@callback = sinon.stub()
|
||||||
|
@ -318,6 +322,19 @@ describe "RedisManager", ->
|
||||||
it "should call the callback", ->
|
it "should call the callback", ->
|
||||||
@callback.called.should.equal true
|
@callback.called.should.equal true
|
||||||
|
|
||||||
|
describe "with null bytes in the serialized doc lines", ->
|
||||||
|
beforeEach ->
|
||||||
|
@RedisManager.getDocVersion.withArgs(@doc_id).yields(null, @version - @ops.length)
|
||||||
|
@_stringify = JSON.stringify
|
||||||
|
@JSON.stringify = () -> return '["bad bytes! \u0000 <- here"]'
|
||||||
|
@RedisManager.updateDocument @doc_id, @lines, @version, @ops, @ranges, @callback
|
||||||
|
|
||||||
|
afterEach ->
|
||||||
|
@JSON.stringify = @_stringify
|
||||||
|
|
||||||
|
it "should call the callback with an error", ->
|
||||||
|
@callback.calledWith(new Error("null bytes found in doc lines")).should.equal true
|
||||||
|
|
||||||
describe "putDocInMemory", ->
|
describe "putDocInMemory", ->
|
||||||
beforeEach ->
|
beforeEach ->
|
||||||
@rclient.set = sinon.stub()
|
@rclient.set = sinon.stub()
|
||||||
|
@ -391,6 +408,18 @@ describe "RedisManager", ->
|
||||||
@logger.error.calledWith()
|
@logger.error.calledWith()
|
||||||
.should.equal true
|
.should.equal true
|
||||||
|
|
||||||
|
describe "with null bytes in the serialized doc lines", ->
|
||||||
|
beforeEach ->
|
||||||
|
@_stringify = JSON.stringify
|
||||||
|
@JSON.stringify = () -> return '["bad bytes! \u0000 <- here"]'
|
||||||
|
@RedisManager.putDocInMemory @project_id, @doc_id, @lines, @version, @ranges, @callback
|
||||||
|
|
||||||
|
afterEach ->
|
||||||
|
@JSON.stringify = @_stringify
|
||||||
|
|
||||||
|
it "should call the callback with an error", ->
|
||||||
|
@callback.calledWith(new Error("null bytes found in doc lines")).should.equal true
|
||||||
|
|
||||||
describe "removeDocFromMemory", ->
|
describe "removeDocFromMemory", ->
|
||||||
beforeEach (done) ->
|
beforeEach (done) ->
|
||||||
@rclient.del = sinon.stub()
|
@rclient.del = sinon.stub()
|
||||||
|
|
Loading…
Reference in a new issue