Skip to content

fix(federation): prevent inviting federated users to non-federated rooms via slash command #37169

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 4 commits into from
Oct 9, 2025
Merged

fix(federation): prevent inviting federated users to non-federated rooms via slash command #37169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c9f75e
check for federated users being added on non-federated rooms
ricardogarim Oct 8, 2025
c1a136c
remove unused user check on addUsersToRoomMethod
ricardogarim Oct 9, 2025
e5f655b
rename isFederatedUsername to sanitizeUsername
ricardogarim Oct 9, 2025
8e5169c
make addUserToRoom to receive user instead of user or string
ricardogarim Oct 9, 2025
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
20 changes: 15 additions & 5 deletions apps/meteor/app/lib/server/methods/addUsersToRoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { api } from '@rocket.chat/core-services';
import type { IUser } from '@rocket.chat/core-typings';
import { isRoomNativeFederated, isUserNativeFederated } from '@rocket.chat/core-typings';
import type { ServerMethods } from '@rocket.chat/ddp-client';
import { Subscriptions, Users, Rooms } from '@rocket.chat/models';
import { Match } from 'meteor/check';
Expand All @@ -17,10 +18,6 @@ declare module '@rocket.chat/ddp-client' {
}
}

const isAFederatedUsername = (username: string) => {
return username.includes('@') && username.includes(':');
};

export const addUsersToRoomMethod = async (userId: string, data: { rid: string; users: string[] }, user?: IUser): Promise<boolean> => {
if (!userId) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', {
Expand Down Expand Up @@ -83,7 +80,20 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
await Promise.all(
data.users.map(async (username) => {
const newUser = await Users.findOneByUsernameIgnoringCase(username);
if (!newUser && !isAFederatedUsername(username)) {

if (!newUser) {
throw new Meteor.Error('error-user-not-found', 'User not found', {
method: 'addUsersToRoom',
});
}

if (isUserNativeFederated(newUser) && !isRoomNativeFederated(room)) {
throw new Meteor.Error('error-federated-users-in-non-federated-rooms', 'Cannot add federated users to non-federated rooms', {
method: 'addUsersToRoom',
});
}

if (!newUser && !isUserNativeFederated(newUser)) {
Copy link
Member

@rodrigok rodrigok Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you validating isUserNativeFederated if the user is undefined?
This whole if is not necessary!

throw new Meteor.Error('error-invalid-username', 'Invalid username', {
method: 'addUsersToRoom',
});
Expand Down
19 changes: 12 additions & 7 deletions apps/meteor/app/slashcommands-invite/server/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import { addUsersToRoomMethod } from '../../lib/server/methods/addUsersToRoom';
import { settings } from '../../settings/server';
import { slashCommands } from '../../utils/server/slashCommand';

const isFederatedUsername = (username: string) => {
return username.includes('@') && username.includes(':');
};

/*
* Invite is a named function that will replace /invite commands
* @param {Object} message - The message object
Expand All @@ -17,16 +21,12 @@ slashCommands.add({
callback: async ({ params, message, userId }: SlashCommandCallbackParams<'invite'>): Promise<void> => {
const usernames = params
.split(/[\s,]/)
.map((username) => username.replace(/(^@)|( @)/, ''))
.map((username) => (isFederatedUsername(username) ? username : username.replace(/(^@)|( @)/, '')))
.filter((a) => a !== '');
if (usernames.length === 0) {
return;
}
const users = await Users.find({
username: {
$in: usernames,
},
}).toArray();
const users = await Users.findByUsernames(usernames).toArray();
if (users.length === 0) {
void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
msg: i18n.t('User_doesnt_exist', {
Expand Down Expand Up @@ -81,7 +81,12 @@ slashCommands.add({
if (typeof error !== 'string') {
return;
}
if (error === 'cant-invite-for-direct-room') {

if (error === 'error-federated-users-in-non-federated-rooms') {
void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
msg: i18n.t('You_cannot_add_external_users_to_non_federated_room', { lng: settings.get('Language') || 'en' }),
});
} else if (error === 'cant-invite-for-direct-room') {
void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
msg: i18n.t('Cannot_invite_users_to_direct_rooms', { lng: settings.get('Language') || 'en' }),
});
Expand Down
Loading