feat(federation): Add XMPP bridge support

apps/meteor/app/file-upload/server/lib/FileUpload.ts

@@ -139,20 +139,22 @@ export const FileUpload = {
 	},
 
 	async validateFileUpload(file: IUpload, content?: Buffer | string) {
-		if (!Match.test(file.rid, String)) {
+		const isFederationUpload = Boolean(file.federation?.mxcUri);
+
+		if (!isFederationUpload && !Match.test(file.rid, String)) {
 			return false;
 		}
 
 		// livechat users can upload files but they don't have an userId
 		const user = (file.userId && (await Users.findOne(file.userId))) || undefined;
 
-		const room = await Rooms.findOneById(file.rid);
-		if (!room) {
+		const room = file.rid ? await Rooms.findOneById(file.rid) : undefined;
+		if (!isFederationUpload && !room) {
 			return false;
 		}
 		const directMessageAllowed = settings.get('FileUpload_Enabled_Direct');
 		const fileUploadAllowed = settings.get('FileUpload_Enabled');
-		if (user?.type !== 'app' && (await canAccessRoomAsync(room, user, file)) !== true) {
+		if (!isFederationUpload && room && user?.type !== 'app' && (await canAccessRoomAsync(room, user, file)) !== true) {
 			return false;
 		}
 		const language = user?.language || 'en';
@@ -161,7 +163,7 @@ export const FileUpload = {
 			throw new Meteor.Error('error-file-upload-disabled', reason);
 		}
 
-		if (!directMessageAllowed && room.t === 'd') {
+		if (room && !directMessageAllowed && room.t === 'd') {
 			const reason = i18n.t('File_not_allowed_direct_messages', { lng: language });
 			throw new Meteor.Error('error-direct-message-file-upload-not-allowed', reason);
 		}

apps/meteor/client/startup/slashCommands/federation.ts

@@ -18,3 +18,12 @@ slashCommands.add({
 	previewer,
 	previewCallback,
 });
+
+slashCommands.add({
+	command: 'xmpp',
+	options: {
+		description: 'Join xmpp rooms',
+		params: '#channel',
+	},
+	providesPreview: false,
+});

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

@@ -1,10 +1,14 @@
 import { api, FederationMatrix as FederationMatrixService } from '@rocket.chat/core-services';
+import type { SlashCommandCallbackParams } from '@rocket.chat/core-typings';
 import { FederationMatrix, configureFederationMatrixSettings, setupFederationMatrix } from '@rocket.chat/federation-matrix';
 import { InstanceStatus } from '@rocket.chat/instance-status';
 import { License } from '@rocket.chat/license';
 import { Logger } from '@rocket.chat/logger';
+import { Users } from '@rocket.chat/models';
 
 import { settings } from '../../../app/settings/server';
+import { slashCommands } from '../../../app/utils/server/slashCommand';
+import { i18n } from '../../../server/lib/i18n';
 import { StreamerCentral } from '../../../server/modules/streamer/streamer.module';
 import { registerFederationRoutes } from '../api/federation';
 
@@ -20,7 +24,7 @@ const configureFederation = async () => {
 	}
 
 	try {
-		configureFederationMatrixSettings({
+		await configureFederationMatrixSettings({
 			instanceId: InstanceStatus.id(),
 			domain: settings.get('Federation_Service_Domain'),
 			signingKey: settings.get('Federation_Service_Matrix_Signing_Key'),
@@ -31,6 +35,10 @@ const configureFederation = async () => {
 			processEDUTyping: settings.get('Federation_Service_EDU_Process_Typing'),
 			processEDUPresence: settings.get('Federation_Service_EDU_Process_Presence'),
 			processEDUReceipt: settings.get('Federation_Service_EDU_Process_Receipt'),
+			xmppEnabled: settings.get('Federation_XMPP_Enabled'),
+			xmppBridgeURL: settings.get('Federation_XMPP_Bridge_URL'),
+			xmppBridgeHSToken: settings.get('Federation_XMPP_Bridge_HS_Token'),
+			xmppBridgeASToken: settings.get('Federation_XMPP_Bridge_AS_Token'),
 		});
 	} catch (err) {
 		logger.error({ msg: 'Failed to start federation-matrix service', err });
@@ -55,6 +63,16 @@ export const startFederationService = async (): Promise<void> => {
 		}
 	});
 
+	// `setupFederationMatrix()` runs the SDK's `init()`, which registers the DB
+	// collections (including `AppServiceStateCollection`). It must complete
+	// before the settings watcher below, whose initial fire calls `setConfig`
+	// and resolves repositories that depend on those collections.
+	try {
+		await setupFederationMatrix();
+	} catch (err) {
+		logger.error({ msg: 'Failed to setup federation-matrix:', err });
+	}
+
 	settings.watchMultiple(
 		[
 			'Federation_Service_Enabled',
@@ -67,15 +85,52 @@ export const startFederationService = async (): Promise<void> => {
 			'Federation_Service_Matrix_Signing_Version',
 			'Federation_Service_Join_Encrypted_Rooms',
 			'Federation_Service_Join_Non_Private_Rooms',
+			'Federation_XMPP_Enabled',
+			'Federation_XMPP_Bridge_URL',
+			'Federation_XMPP_Bridge_HS_Token',
+			'Federation_XMPP_Bridge_AS_Token',
 		],
 		async () => {
 			await configureFederation();
 		},
 	);
 
-	try {
-		await setupFederationMatrix();
-	} catch (err) {
-		logger.error({ msg: 'Failed to setup federation-matrix:', err });
-	}
+	slashCommands.add({
+		command: 'xmpp',
+		callback: async ({ params, message, userId }: SlashCommandCallbackParams<'xmpp'>): Promise<void> => {
+			// the helper advertises `#channel`, so accept the leading # and strip it before joining
+			const channel = params.trim().replace(/^#/, '');
+			if (!channel) {
+				void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
+					msg: i18n.t('Federation_XMPP_Join_Channel_Required', {
+						lng: settings.get('Language') || 'en',
+					}),
+				});
+				return;
+			}
+
+			const user = await Users.findOneById(userId);
+			if (!user) {
+				logger.error({ msg: 'User not found for joining xmpp room', userId });
+				return;
+			}
+
+			const joined = await FederationMatrixService.joinXMPPChatRoom(channel, user);
+
+			const lng = settings.get<string>('Language') || 'en';
+			if (joined) {
+				void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
+					msg: `${i18n.t('Federation_XMPP_Join_Channel_Success', { lng })}`,
+				});
+			} else {
+				void api.broadcast('notify.ephemeralMessage', userId, message.rid, {
+					msg: `${i18n.t('Federation_XMPP_Join_Channel_Failed', { lng })}`,
+				});
+			}
+		},
+		options: {
+			description: 'Join xmpp rooms',
+			params: '#channel',
+		},
+	});
 };

apps/meteor/package.json

@@ -106,7 +106,7 @@
 		"@rocket.chat/emitter": "^0.32.0",
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/federation-matrix": "workspace:^",
-		"@rocket.chat/federation-sdk": "0.6.3",
+		"@rocket.chat/federation-sdk": "0.7.0-beta.4",
 		"@rocket.chat/fuselage": "^0.79.1",
 		"@rocket.chat/fuselage-forms": "^1.3.0",
 		"@rocket.chat/fuselage-hooks": "^0.41.0",

apps/meteor/server/services/upload/service.ts

@@ -27,9 +27,9 @@ const logger = new Logger('UploadService');
 export class UploadService extends ServiceClassInternal implements IUploadService {
 	protected name = 'upload';
 
-	async uploadFile({ buffer, details }: IUploadFileParams): Promise<IUpload> {
+	async uploadFile({ buffer, details, federation }: IUploadFileParams): Promise<IUpload> {
 		const fileStore = FileUpload.getStore('Uploads');
-		return fileStore.insert(details, buffer);
+		return fileStore.insert({ ...details, ...(federation && { federation }) }, buffer);
 	}
 
 	async sendFileMessage({ roomId, file, userId, message }: ISendFileMessageParams): Promise<boolean | undefined> {

apps/meteor/server/settings/federation-service.ts

@@ -116,5 +116,40 @@ export const createFederationServiceSettings = async (): Promise<void> => {
 			modules: ['federation'],
 			invalidValue: false,
 		});
+
+		await this.section('XMPP', async function () {
+			await this.add('Federation_XMPP_Enabled', false, {
+				type: 'boolean',
+				enterprise: true,
+				modules: ['federation'],
+				i18nLabel: 'Enabled',
+				invalidValue: false,
+				enableQuery: { _id: 'Federation_Service_Enabled', value: true },
+			});
+
+			await this.add('Federation_XMPP_Bridge_URL', '', {
+				type: 'string',
+				enterprise: true,
+				modules: ['federation'],
+				invalidValue: '',
+				enableQuery: { _id: 'Federation_XMPP_Enabled', value: true },
+			});
+
+			await this.add('Federation_XMPP_Bridge_HS_Token', '', {
+				type: 'password',
+				enterprise: true,
+				modules: ['federation'],
+				invalidValue: '',
+				enableQuery: { _id: 'Federation_Service_Enabled', value: true },
+			});
+
+			await this.add('Federation_XMPP_Bridge_AS_Token', '', {
+				type: 'password',
+				enterprise: true,
+				modules: ['federation'],
+				invalidValue: '',
+				enableQuery: { _id: 'Federation_Service_Enabled', value: true },
+			});
+		});
 	});
 };

ee/packages/federation-matrix/package.json

@@ -22,7 +22,7 @@
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "^0.32.0",
-		"@rocket.chat/federation-sdk": "0.6.3",
+		"@rocket.chat/federation-sdk": "0.7.0-beta.4",
 		"@rocket.chat/http-router": "workspace:^",
 		"@rocket.chat/license": "workspace:^",
 		"@rocket.chat/models": "workspace:^",