Skip to content

[FIX] Discussion not updating rooms list and not checking right permissions #17959

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
rodrigok merged 3 commits into from
Jun 19, 2020
Merged

[FIX] Discussion not updating rooms list and not checking right permissions #17959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fa35eb
Fix discussion on read only and update subscription
sampaiodiego Jun 19, 2020
110a770
Merge branch 'develop' into fix-discussion-creation
sampaiodiego Jun 19, 2020
0403b46
Fix invalid room
sampaiodiego Jun 19, 2020
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
4 changes: 4 additions & 0 deletions app/authorization/server/functions/canSendMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ const subscriptionOptions = {
};

export const validateRoomMessagePermissionsAsync = async (room, { uid, username, type }, extraData) => {
if (!room) {
throw new Error('error-invalid-room');
}

if (type !== 'app' && !await canAccessRoomAsync(room, { _id: uid, username }, extraData)) {
throw new Error('error-not-allowed');
}
Expand Down
29 changes: 15 additions & 14 deletions app/discussion/server/methods/createDiscussion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';

import { hasAtLeastOnePermission, canAccessRoom } from '../../../authorization/server';
import { hasAtLeastOnePermission, canSendMessage } from '../../../authorization/server';
import { Messages, Rooms } from '../../../models/server';
import { createRoom, addUserToRoom, sendMessage, attachMessage } from '../../../lib/server';
import { settings } from '../../../settings/server';
import { roomTypes } from '../../../utils/server';
import { callbacks } from '../../../callbacks/server';

const getParentRoom = (rid) => {
const room = Rooms.findOne(rid);
Expand Down Expand Up @@ -34,7 +35,7 @@ const mentionMessage = (rid, { _id, username, name }, message_embedded) => {
return Messages.insert(welcomeMessage);
};

const create = ({ prid, pmid, t_name, reply, users }) => {
const create = ({ prid, pmid, t_name, reply, users, user }) => {
// if you set both, prid and pmid, and the rooms doesnt match... should throw an error)
let message = false;
if (pmid) {
Expand All @@ -55,20 +56,17 @@ const create = ({ prid, pmid, t_name, reply, users }) => {
throw new Meteor.Error('error-invalid-arguments', { method: 'DiscussionCreation' });
}

const p_room = Rooms.findOne(prid);
if (!p_room) {
throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'DiscussionCreation' });
let p_room;
try {
p_room = canSendMessage(prid, { uid: user._id, username: user.username, type: user.type });
} catch (error) {
throw new Meteor.Error(error.message);
}

if (p_room.prid) {
throw new Meteor.Error('error-nested-discussion', 'Cannot create nested discussions', { method: 'DiscussionCreation' });
}

const user = Meteor.user();

if (!canAccessRoom(p_room, user)) {
throw new Meteor.Error('error-not-allowed', { method: 'DiscussionCreation' });
}

if (pmid) {
const discussionAlreadyExists = Rooms.findOne({
prid,
Expand Down Expand Up @@ -98,14 +96,17 @@ const create = ({ prid, pmid, t_name, reply, users }) => {
nameValidationRegex: /.*/,
});

let discussionMsg;
if (pmid) {
mentionMessage(discussion._id, user, attachMessage(message, p_room));

createDiscussionMessage(message.rid, user, discussion._id, t_name, attachMessage(message, p_room));
discussionMsg = createDiscussionMessage(message.rid, user, discussion._id, t_name, attachMessage(message, p_room));
} else {
createDiscussionMessage(prid, user, discussion._id, t_name);
discussionMsg = createDiscussionMessage(prid, user, discussion._id, t_name);
}

callbacks.runAsync('afterSaveMessage', discussionMsg, p_room, user._id);

if (reply) {
sendMessage(user, { msg: reply }, discussion);
}
Expand Down Expand Up @@ -136,6 +137,6 @@ Meteor.methods({
throw new Meteor.Error('error-action-not-allowed', 'You are not allowed to create a discussion', { method: 'createDiscussion' });
}

return create({ uid, prid, pmid, t_name, reply, users });
return create({ uid, prid, pmid, t_name, reply, users, user: Meteor.user() });
},
});