Skip to content

Node.js based forum software built for the modern web

fix: enforce same checks on topic room enter as controller

Barış Soner Uşaklı54ff68be487b
diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js
index f2181344e8..0dd6bdc528 100644
--- a/src/socket.io/meta.js
+++ b/src/socket.io/meta.js
@@ -50,7 +50,17 @@ SocketMeta.rooms.enter = async function (socket, data) {
if (data.enter && data.enter.startsWith('topic_')) {
const tid = data.enter.split('_').pop();
- if (!await privileges.topics.can('topics:read', tid, socket.uid)) {
+ const [topicData, topicPrivileges] = await Promise.all([
+ topics.getTopicFields(tid, ['deleted', 'scheduled']),
+ privileges.topics.get(tid, socket.uid),
+ ]);
+ const canEnter = topicData &&
+ !topicPrivileges.disabled &&
+ topicPrivileges['topics:read'] &&
+ (!topicData.scheduled || topicPrivileges.view_scheduled) &&
+ (topicData.scheduled || !topicData.deleted || topicPrivileges.view_deleted);
+
+ if (!canEnter) {
throw new Error('[[error:no-privileges]]');
}
}
diff --git a/test/topics.js b/test/topics.js
index 25f3a723ad..551e880649 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -2476,6 +2476,18 @@ describe('Topic\'s', () => {
assert(body);
});
+ it('should prevent user from joining topic socket.io room if it is scheduled', async () => {
+ const socketMeta = require('../src/socket.io/meta');
+ await assert.rejects(
+ socketMeta.rooms.enter({ uid: fooUid }, { enter: `topic_${topicData.tid}` }),
+ { message: '[[error:no-privileges]]' }
+ );
+
+ // admin can still join
+ await socketMeta.rooms.enter({ uid: adminUid, join: () => {} }, { enter: `topic_${topicData.tid}` });
+ await socketMeta.rooms.leaveCurrent({ uid: adminUid, leave: () => {} });
+ });
+
it('should load topic for a privileged user', async () => {
const { response, body } = await request.get(`${nconf.get('url')}/topic/${topicData.slug}`, { jar: adminJar });
assert.strictEqual(response.statusCode, 200);