feat: native federation

.github/workflows/ci-test-storybook.yml

@@ -22,9 +22,10 @@ jobs:
     runs-on: ubuntu-24.04
 
     name: Test Storybook
-    
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
         with:
@@ -54,4 +55,3 @@ jobs:
           flags: unit
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
-

.gitignore

@@ -59,3 +59,5 @@ registration.yaml
 
 storybook-static
 development/tempo-data/
+
+.env

apps/meteor/app/channel-settings/server/functions/saveRoomName.ts

@@ -96,6 +96,6 @@ export async function saveRoomName(
 		await Message.saveSystemMessage('r', rid, displayName, user);
 	}
 
-	await callbacks.run('afterRoomNameChange', { room, name: displayName, oldName: room.name, userId: user._id });
+	await callbacks.run('afterRoomNameChange', { room, name: displayName, oldName: room.name, user });
 	return displayName;
 }

apps/meteor/app/channel-settings/server/functions/saveRoomTopic.ts

@@ -5,15 +5,15 @@ import { Meteor } from 'meteor/meteor';
 
 import { callbacks } from '../../../../lib/callbacks';
 
-export const saveRoomTopic = async function (
+export const saveRoomTopic = async (
 	rid: string,
 	roomTopic: string | undefined,
 	user: {
 		username: string;
 		_id: string;
 	},
 	sendMessage = true,
-) {
+) => {
 	if (!Match.test(rid, String)) {
 		throw new Meteor.Error('invalid-room', 'Invalid room', {
 			function: 'RocketChat.saveRoomTopic',
@@ -28,6 +28,6 @@ export const saveRoomTopic = async function (
 	if (update && sendMessage) {
 		await Message.saveSystemMessage('room_changed_topic', rid, roomTopic || '', user);
 	}
-	await callbacks.run('afterRoomTopicChange', { rid, topic: roomTopic });
+	await callbacks.run('afterRoomTopicChange', undefined, { room, topic: roomTopic, user });
 	return update;
 };

apps/meteor/app/discussion/server/hooks/propagateDiscussionMetadata.ts

@@ -48,7 +48,7 @@ callbacks.add(
 
 callbacks.add(
 	'afterDeleteMessage',
-	async (message, { _id, prid }) => {
+	async (message, { room: { _id, prid } }) => {
 		if (prid) {
 			const room = await Rooms.findOneById(_id, {
 				projection: {

apps/meteor/app/lib/server/functions/addUserToRoom.ts

@@ -1,7 +1,7 @@
 import { Apps, AppEvents } from '@rocket.chat/apps';
 import { AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions';
 import { Message, Team } from '@rocket.chat/core-services';
-import type { IUser } from '@rocket.chat/core-typings';
+import { type IUser } from '@rocket.chat/core-typings';
 import { Subscriptions, Users, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
@@ -19,7 +19,7 @@ import { notifyOnRoomChangedById, notifyOnSubscriptionChangedById } from '../lib
  * Caution - It does not validates if the user has permission to join room
  */
 
-export const addUserToRoom = async function (
+export const addUserToRoom = async (
 	rid: string,
 	user: Pick<IUser, '_id' | 'username'> | string,
 	inviter?: Pick<IUser, '_id' | 'username'>,
@@ -32,7 +32,7 @@ export const addUserToRoom = async function (
 		skipAlertSound?: boolean;
 		createAsHidden?: boolean;
 	} = {},
-): Promise<boolean | undefined> {
+): Promise<boolean | undefined> => {
 	const now = new Date();
 	const room = await Rooms.findOneById(rid);
 
@@ -57,7 +57,7 @@ export const addUserToRoom = async function (
 	}
 
 	try {
-		await beforeAddUserToRoom.run({ user: userToBeAdded, inviter }, room);
+		await beforeAddUserToRoom.run({ user: userToBeAdded, inviter: (inviter && (await Users.findOneById(inviter._id))) || undefined }, room);
 	} catch (error) {
 		throw new Meteor.Error((error as any)?.message);
 	}

apps/meteor/app/lib/server/functions/createDirectRoom.ts

@@ -42,10 +42,11 @@ const getName = (members: IUser[]): string => members.map(({ username }) => user
 
 export async function createDirectRoom(
 	members: IUser[] | string[],
-	roomExtraData = {},
+	roomExtraData: Partial<IRoom> = {},
 	options: {
 		creator?: string;
 		subscriptionExtra?: ISubscriptionExtraData;
+		federatedRoomId?: string;
 	},
 ): Promise<ICreatedRoom> {
 	const maxUsers = settings.get<number>('DirectMesssage_maxUsers') || 1;
@@ -59,17 +60,17 @@ export async function createDirectRoom(
 		);
 	}
 
-	await callbacks.run('beforeCreateDirectRoom', members);
-
 	const membersUsernames: string[] = members
 		.map((member) => {
 			if (typeof member === 'string') {
-				return member.replace('@', '');
+				return member;
 			}
 			return member.username;
 		})
 		.filter(isTruthy);
 
+	await callbacks.run('beforeCreateDirectRoom', membersUsernames, roomExtraData);
+
 	const roomMembers: IUser[] = await Users.findUsersByUsernames(membersUsernames, {
 		projection: { _id: 1, name: 1, username: 1, settings: 1, customFields: 1 },
 	}).toArray();
@@ -179,7 +180,11 @@ export async function createDirectRoom(
 	if (isNewRoom) {
 		const insertedRoom = await Rooms.findOneById(rid);
 
-		await callbacks.run('afterCreateDirectRoom', insertedRoom, { members: roomMembers, creatorId: options?.creator });
+		await callbacks.run('afterCreateDirectRoom', insertedRoom, {
+			members: roomMembers,
+			creatorId: options?.creator,
+			mrid: options?.federatedRoomId,
+		});
 
 		void Apps.self?.triggerEvent(AppEvents.IPostRoomCreate, insertedRoom);
 	}

apps/meteor/app/lib/server/functions/createRoom.ts

@@ -68,6 +68,7 @@ async function createUsersSubscriptions({
 
 	const membersCursor = Users.findUsersByUsernames(members);
 
+	// TODO: Check re new federation-service - should we add them here or keep on createRoom inside of homeserver?!
 	for await (const member of membersCursor) {
 		try {
 			await beforeAddUserToRoom.run({ user: member, inviter: owner }, room);
@@ -131,7 +132,25 @@ export const createRoom = async <T extends RoomType>(
 		rid: string;
 	}
 > => {
-	const { teamId, ...extraData } = roomExtraData || ({} as IRoom);
+	const { teamId, ...optionalExtraData } = roomExtraData || ({} as IRoom);
+
+	const hasFederatedMembers = members.some((member) => {
+		if (typeof member === 'string') {
+			return member.includes(':') && member.includes('@');
+		}
+		return member.username?.includes(':') && member.username?.includes('@');
+	});
+
+	const extraData = {
+		...optionalExtraData,
+		...((hasFederatedMembers || optionalExtraData.federated) && {
+			federated: true,
+			federation: {
+				version: 1,
+				// TODO we should be able to provide all values from here, currently we update on callback afterCreateRoom
+			},
+		}),
+	};
 
 	await prepareCreateRoomCallback.run({
 		type,
@@ -265,6 +284,7 @@ export const createRoom = async <T extends RoomType>(
 		callbacks.runAsync('afterCreatePrivateGroup', owner, room);
 	}
 	callbacks.runAsync('afterCreateRoom', owner, room);
+
 	if (shouldBeHandledByFederation) {
 		callbacks.runAsync('federation.afterCreateFederatedRoom', room, { owner, originalMemberList: members, options });
 	}

apps/meteor/app/lib/server/functions/deleteMessage.ts

@@ -93,7 +93,7 @@ export async function deleteMessage(message: IMessage, user: IUser): Promise<voi
 		await Rooms.decreaseMessageCountById(message.rid, 1);
 	}
 
-	await callbacks.run('afterDeleteMessage', deletedMsg, room);
+	await callbacks.run('afterDeleteMessage', deletedMsg, { room, user });
 
 	void notifyOnRoomChangedById(message.rid);
 

apps/meteor/app/lib/server/functions/setUserActiveStatus.ts

@@ -1,7 +1,6 @@
-import { Federation, FederationEE, License } from '@rocket.chat/core-services';
 import type { IUser, IUserEmail } from '@rocket.chat/core-typings';
 import { isUserFederated, isDirectMessageRoom } from '@rocket.chat/core-typings';
-import { Rooms, Users, Subscriptions, MatrixBridgedUser } from '@rocket.chat/models';
+import { Rooms, Users, Subscriptions } from '@rocket.chat/models';
 import { Accounts } from 'meteor/accounts-base';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -71,22 +70,6 @@ export async function setUserActiveStatus(
 		});
 	}
 
-	if (user.active !== active) {
-		const remoteUser = await MatrixBridgedUser.getExternalUserIdByLocalUserId(userId);
-
-		if (remoteUser) {
-			if (active) {
-				throw new Meteor.Error('error-not-allowed', 'Deactivated federated users can not be re-activated', {
-					method: 'setUserActiveStatus',
-				});
-			}
-
-			const federation = (await License.hasValidLicense()) ? FederationEE : Federation;
-
-			await federation.deactivateRemoteUser(remoteUser);
-		}
-	}
-
 	// Users without username can't do anything, so there is no need to check for owned rooms
 	if (user.username != null && !active) {
 		const userAdmin = await Users.findOneAdmin(userId || '');

apps/meteor/app/lib/server/methods/sendMessage.ts

@@ -55,13 +55,7 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 		}
 	}
 
-	const user = await Users.findOneById(uid, {
-		projection: {
-			username: 1,
-			type: 1,
-			name: 1,
-		},
-	});
+	const user = await Users.findOneById(uid);
 	if (!user?.username) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user');
 	}

apps/meteor/app/reactions/server/setReaction.ts

@@ -33,13 +33,7 @@ export const removeUserReaction = (message: IMessage, reaction: string, username
 	return message;
 };
 
-export async function setReaction(
-	room: Pick<IRoom, '_id' | 'muted' | 'unmuted' | 'reactWhenReadOnly' | 'ro' | 'lastMessage' | 'federated'>,
-	user: IUser,
-	message: IMessage,
-	reaction: string,
-	userAlreadyReacted?: boolean,
-) {
+export async function setReaction(room: IRoom, user: IUser, message: IMessage, reaction: string, userAlreadyReacted?: boolean) {
 	await Message.beforeReacted(message, room);
 
 	if (Array.isArray(room.muted) && room.muted.includes(user.username as string)) {
@@ -71,7 +65,7 @@ export async function setReaction(
 				await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 			}
 		}
-		void callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact: false, oldMessage });
+		void callbacks.run('afterUnsetReaction', message, { user, reaction, shouldReact: false, oldMessage, room });
 
 		isReacted = false;
 	} else {
@@ -89,7 +83,7 @@ export async function setReaction(
 			await Rooms.setReactionsInLastMessage(room._id, message.reactions);
 		}
 
-		void callbacks.run('afterSetReaction', message, { user, reaction, shouldReact: true });
+		void callbacks.run('afterSetReaction', message, { user, reaction, shouldReact: true, room });
 
 		isReacted = true;
 	}
@@ -139,9 +133,7 @@ export async function executeSetReaction(
 		return;
 	}
 
-	const room = await Rooms.findOneById<
-		Pick<IRoom, '_id' | 'ro' | 'muted' | 'reactWhenReadOnly' | 'lastMessage' | 't' | 'prid' | 'federated'>
-	>(message.rid, { projection: { _id: 1, ro: 1, muted: 1, reactWhenReadOnly: 1, lastMessage: 1, t: 1, prid: 1, federated: 1 } });
+	const room = await Rooms.findOneById(message.rid);
 	if (!room) {
 		throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 	}

apps/meteor/client/components/message/content/attachments/file/hooks/useReloadOnError.spec.tsx

@@ -166,7 +166,7 @@ describe('useReloadOnError', () => {
 		);
 
 		// Mock fetch to return first, then second
-		(global.fetch as jest.Mock) = jest.fn().mockResolvedValueOnce(firstReply).mockResolvedValueOnce(secondReply);
+		(global.fetch as unknown as jest.Mock) = jest.fn().mockResolvedValueOnce(firstReply).mockResolvedValueOnce(secondReply);
 
 		const { result } = renderHook(() => useReloadOnError('/sampleurl?token=old', 'audio'));
 		const media = makeMediaEl();
@@ -217,7 +217,7 @@ describe('useReloadOnError', () => {
 
 	it('ignores initial play when expiry is unknown', async () => {
 		// no fetch expected on first play because expiresAt is not known yet
-		global.fetch = jest.fn();
+		(global.fetch as unknown as jest.Mock) = jest.fn();
 
 		const { result } = renderHook(() => useReloadOnError('/foo', 'audio'));
 		const media = makeMediaEl();

apps/meteor/client/hooks/useIsFederationEnabled.ts

@@ -1,6 +1,8 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
 
 export const useIsFederationEnabled = () => {
-	const federationMatrixEnabled = useSetting('Federation_Matrix_enabled', false) === true;
-	return federationMatrixEnabled;
+	const matrixFederationEnabled = useSetting('Federation_Matrix_enabled', false);
+	const serviceFederationEnabled = useSetting('Federation_Service_Enabled', false);
+	const federationEnabled = matrixFederationEnabled || serviceFederationEnabled;
+	return federationEnabled;
 };

apps/meteor/client/lib/e2ee/rocketchat.e2e.room.ts

@@ -1,5 +1,6 @@
 import { Base64 } from '@rocket.chat/base64';
-import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUser, IUploadWithUser, AtLeast } from '@rocket.chat/core-typings';
+import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUser, AtLeast, EncryptedMessageContent } from '@rocket.chat/core-typings';
+import { isEncryptedMessageContent } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import type { Optional } from '@tanstack/react-query';
 import EJSON from 'ejson';
@@ -670,11 +671,9 @@ export class E2ERoom extends Emitter {
 		return this.encryptText(data);
 	}
 
-	async decryptContent<T extends IUploadWithUser | IE2EEMessage>(data: T) {
-		if (data.content && data.content.algorithm === 'rc.v1.aes-sha2') {
-			const content = await this.decrypt(data.content.ciphertext);
-			Object.assign(data, content);
-		}
+	async decryptContent<T extends EncryptedMessageContent>(data: T) {
+		const content = await this.decrypt(data.content.ciphertext);
+		Object.assign(data, content);
 
 		return data;
 	}
@@ -693,7 +692,7 @@ export class E2ERoom extends Emitter {
 			}
 		}
 
-		message = await this.decryptContent(message);
+		message = isEncryptedMessageContent(message) ? await this.decryptContent(message) : message;
 
 		return {
 			...message,

apps/meteor/client/lib/e2ee/rocketchat.e2e.ts

@@ -2,7 +2,7 @@ import QueryString from 'querystring';
 import URL from 'url';
 
 import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUser, IUploadWithUser, MessageAttachment } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isEncryptedMessageContent } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { imperativeModal } from '@rocket.chat/ui-client';
 import EJSON from 'ejson';
@@ -664,7 +664,7 @@ class E2E extends Emitter {
 	}
 
 	async decryptFileContent(file: IUploadWithUser): Promise<IUploadWithUser> {
-		if (!file.rid) {
+		if (!file.rid || !isEncryptedMessageContent(file)) {
 			return file;
 		}
 

apps/meteor/ee/server/api/federation.ts

@@ -0,0 +1,24 @@
+import type { IFederationMatrixService } from '@rocket.chat/core-services';
+import { Logger } from '@rocket.chat/logger';
+import type express from 'express';
+import { WebApp } from 'meteor/webapp';
+
+import { isRunningMs } from '../../../server/lib/isRunningMs';
+
+const logger = new Logger('FederationRoutes');
+
+export async function registerFederationRoutes(federationService: IFederationMatrixService): Promise<void> {
+	if (isRunningMs()) {
+		return;
+	}
+
+	try {
+		const routes = federationService.getAllRoutes();
+		(WebApp.rawConnectHandlers as unknown as ReturnType<typeof express>).use(routes.matrix.router).use(routes.wellKnown.router);
+
+		logger.log('[Federation] Registered federation routes');
+	} catch (error) {
+		logger.error('[Federation] Failed to register routes:', error);
+		throw error;
+	}
+}