github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-24 03:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

handle disconnects of unauthenticated users

Browse source
This commit is contained in:
Brian Gough 2017-02-23 12:04:36 +00:00
parent 50930cd7b1
commit d468f662ac
2 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/real-time/app/coffee/WebsocketController.coffee
View file

@ -52,6 +52,16 @@ module.exports = WebsocketController =
metrics.inc "editor.leave-project"
Utils.getClientAttributes client, ["project_id", "user_id"], (error, {project_id, user_id}) ->
return callback(error) if error?
# bail out if the client had not managed to authenticate or join
# the project. Prevents downstream errors in docupdater from
# flushProjectToMongoAndDelete with null project_id.
if not user_id?
logger.log {client_id: client.id}, "client leaving, unknown user"
return callback()
if not project_id?
logger.log {user_id: user_id, client_id: client.id}, "client leaving, not in project"
return callback()
logger.log {project_id, user_id, client_id: client.id}, "client leaving project"
WebsocketLoadBalancer.emitToRoom project_id, "clientTracking.clientDisconnected", client.id

51
services/real-time/test/unit/coffee/WebsocketControllerTests.coffee
View file

@ -129,6 +129,7 @@ describe 'WebsocketController', ->
throw "expected room_id to be project_id"
return @clientsInRoom
@client.params.project_id = @project_id
@client.params.user_id = @user_id
@WebsocketController.FLUSH_IF_EMPTY_DELAY = 0
tk.reset() # Allow setTimeout to work.
@ -163,7 +164,55 @@ describe 'WebsocketController', ->
it "should not flush the project in the document updater", ->
@DocumentUpdaterManager.flushProjectToMongoAndDelete
.called.should.equal false
describe "when client has not authenticated", ->
beforeEach (done) ->
@client.params.user_id = null
@client.params.project_id = null
@WebsocketController.leaveProject @io, @client, done
it "should not end clientTracking.clientDisconnected to the project room", ->
@WebsocketLoadBalancer.emitToRoom
.calledWith(@project_id, "clientTracking.clientDisconnected", @client.id)
.should.equal false
it "should not mark the user as disconnected", ->
@ConnectedUsersManager.markUserAsDisconnected
.calledWith(@project_id, @client.id)
.should.equal false
it "should not flush the project in the document updater", ->
@DocumentUpdaterManager.flushProjectToMongoAndDelete
.calledWith(@project_id)
.should.equal false
it "should increment the leave-project metric", ->
@metrics.inc.calledWith("editor.leave-project").should.equal true
describe "when client has not joined a project", ->
beforeEach (done) ->
@client.params.user_id = @user_id
@client.params.project_id = null
@WebsocketController.leaveProject @io, @client, done
it "should not end clientTracking.clientDisconnected to the project room", ->
@WebsocketLoadBalancer.emitToRoom
.calledWith(@project_id, "clientTracking.clientDisconnected", @client.id)
.should.equal false
it "should not mark the user as disconnected", ->
@ConnectedUsersManager.markUserAsDisconnected
.calledWith(@project_id, @client.id)
.should.equal false
it "should not flush the project in the document updater", ->
@DocumentUpdaterManager.flushProjectToMongoAndDelete
.calledWith(@project_id)
.should.equal false
it "should increment the leave-project metric", ->
@metrics.inc.calledWith("editor.leave-project").should.equal true
describe "joinDoc", ->
beforeEach ->
@doc_id = "doc-id-123"