github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13325 from overleaf/jpa-real-time-check

Browse source 
[real-time] add check for project admin

GitOrigin-RevId: 1677b78cf7f263fc98ca539e26e21553d0ea55bd
This commit is contained in:
Jakob Ackermann 2023-06-05 11:18:00 +01:00 committed by Copybot
parent 14e014c667
commit 6d4d643fd9
4 changed files with 58 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
services/real-time/app/js/WebsocketLoadBalancer.js
View file

@ -179,9 +179,32 @@ module.exports = WebsocketLoadBalancer = {
client.emit('project:access:revoked')
client.disconnect()
} else {
if (
!(isRestrictedMessage && client.ol_context.is_restricted_user)
if (isRestrictedMessage && client.ol_context.is_restricted_user) {
// hide restricted message
logger.debug(
{
message,
clientId: client.id,
userId: client.ol_context.user_id,
projectId: client.ol_context.project_id,
},
'hiding restricted message from client'
)
} else if (
message.message === 'project:tokens:changed' &&
client.ol_context.owner_id !== client.ol_context.user_id
) {
// hide owner only message
logger.debug(
{
message,
clientId: client.id,
userId: client.ol_context.user_id,
projectId: client.ol_context.project_id,
},
'hiding owner only message from client'
)
} else {
client.emit(message.message, ...message.payload)
}
}

1
services/real-time/test/acceptance/js/JoinProjectTests.js
View file

@ -66,6 +66,7 @@ describe('joinProject', function () {
it('should return the project', function () {
return this.project.should.deep.equal({
name: 'Test Project',
owner: { _id: this.user_id },
})
})

27
services/real-time/test/acceptance/js/ReceiveEditorEventTests.js
View file

@ -234,6 +234,7 @@ describe('receiveEditorEvent', function () {
'userRemovedFromProject',
'project:publicAccessLevel:changed',
'project:access:revoked',
'project:tokens:changed',
]
for (const eventName of eventNames) {
@ -273,6 +274,32 @@ describe('receiveEditorEvent', function () {
}
})
describe('event: project:tokens:changed', function () {
beforeEach(function (done) {
rclient.publish(
'editor-events',
JSON.stringify({
room_id: this.project_id,
message: 'project:tokens:changed',
payload: [{ tokens: 'TOKENS' }],
})
)
setTimeout(done, 200)
})
it('should send the event to the owner', function () {
expect(this.owner_updates).to.deep.equal([
{ 'project:tokens:changed': { tokens: 'TOKENS' } },
])
})
it('should not send the event to the other clients', function () {
expect(this.user_a_updates).to.deep.equal([])
expect(this.user_b_updates).to.deep.equal([])
expect(this.user_c_updates).to.deep.equal([])
})
})
describe('event: project:publicAccessLevel:changed, set to private', function () {
beforeEach(function (done) {
/**

5
services/real-time/test/acceptance/js/helpers/MockWebServer.js
View file

@ -33,6 +33,11 @@ module.exports = MockWebServer = {
MockWebServer.privileges[projectId][userId] ||
MockWebServer.privileges[projectId]['anonymous-user']
const userMetadata = MockWebServer.userMetadata[projectId]?.[userId]
if (privilegeLevel === 'owner') {
project.owner = { _id: userId }
} else {
project.owner = { _id: '404404404404404404404404' }
}
return callback(null, project, privilegeLevel, userMetadata)
},