Skip to content

[FIX] Users can access public discussions inside private channels they are not members of #25981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 11 commits into from
Aug 17, 2022
Merged

[FIX] Users can access public discussions inside private channels they are not members of #25981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
271809c
add verifications to prevent a `user` to access `public discussions` …
LucianoPierdona Jun 23, 2022
81df1a8
refactor on `prids` formatting
LucianoPierdona Jul 12, 2022
ce27aa7
Merge remote-tracking branch 'origin/develop' into fix/outside-user-a…
LucianoPierdona Jul 13, 2022
9bde1ee
refactor on `getMessages`
LucianoPierdona Jul 13, 2022
a374caf
Merge branch 'develop' into fix/outside-user-access-discussion-privat…
matheusbsilva137 Jul 14, 2022
8c5cbb9
linting
LucianoPierdona Jul 14, 2022
1895211
refactor get prids on `getMessages`
LucianoPierdona Jul 15, 2022
300d323
Merge branch 'develop' into fix/outside-user-access-discussion-privat…
kodiakhq[bot] Aug 16, 2022
8e1cc3e
Merge branch 'develop' into fix/outside-user-access-discussion-privat…
debdutdeb Aug 17, 2022
dddcb41
Merge branch 'develop' into fix/outside-user-access-discussion-privat…
gabriellsh Aug 17, 2022
47ea72a
Merge branch 'develop' into fix/outside-user-access-discussion-privat…
debdutdeb Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions apps/meteor/app/lib/server/methods/getMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { check } from 'meteor/check';
import type { IMessage } from '@rocket.chat/core-typings';

import { canAccessRoomId } from '../../../authorization/server';
import { Messages } from '../../../models/server';
import { Messages, Rooms } from '../../../models/server';

Meteor.methods({
getMessages(messages) {
Expand All @@ -16,9 +16,22 @@ Meteor.methods({

const msgs = Messages.findVisibleByIds(messages).fetch() as IMessage[];
const rids = [...new Set(msgs.map((m) => m.rid))];
const prids = [
...new Set(
rids.reduce<string[]>((prids, rid) => {
const room = Rooms.findOneById(rid);

if (!rids.every((_id) => canAccessRoomId(_id, uid))) {
throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getSingleMessage' });
if (room?.prid) {
prids.push(room.prid);
}

return prids;
}, []),
),
];

if (!rids.every((_id) => canAccessRoomId(_id, uid)) || !prids.every((_id) => canAccessRoomId(_id, uid))) {
throw new Meteor.Error('error-not-allowed', 'Not allowed', 'getSingleMessage');
}

return msgs;
Expand Down
7 changes: 6 additions & 1 deletion apps/meteor/server/methods/loadHistory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';

import { Subscriptions, Rooms } from '../../app/models/server';
import { canAccessRoom, hasPermission, roomAccessAttributes } from '../../app/authorization/server';
import { canAccessRoom, canAccessRoomId, hasPermission, roomAccessAttributes } from '../../app/authorization/server';
import { settings } from '../../app/settings/server';
import { loadMessageHistory } from '../../app/lib/server';

Expand All @@ -19,6 +19,7 @@ Meteor.methods({
const fromId = Meteor.userId();

const room = Rooms.findOneById(rid, { fields: { ...roomAccessAttributes, t: 1 } });

if (!room) {
return false;
}
Expand All @@ -27,6 +28,10 @@ Meteor.methods({
return false;
}

if (room.prid && !canAccessRoomId(room.prid, fromId)) {
return false;
}

const canAnonymous = settings.get('Accounts_AllowAnonymousRead');
const canPreview = hasPermission(fromId, 'preview-c-room');

Expand Down
8 changes: 7 additions & 1 deletion apps/meteor/server/methods/loadSurroundingMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';

import { canAccessRoomId } from '../../app/authorization/server';
import { Messages } from '../../app/models/server';
import { Messages, Rooms } from '../../app/models/server';
import { settings } from '../../app/settings/server';
import { normalizeMessagesForUser } from '../../app/utils/server/lib/normalizeMessagesForUser';

Expand Down Expand Up @@ -33,6 +33,12 @@ Meteor.methods({
return false;
}

const room = Rooms.findOneById(message.rid);

if (room.prid && !canAccessRoomId(room.prid, fromId)) {
return false;
}

limit -= 1;

const options = {
Expand Down