snapshot of https://github.com/RocketChat/Rocket.Chat.git (develop, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
This commit is contained in:
@@ -0,0 +1,87 @@
|
||||
import type { INewOutgoingIntegration, IOutgoingIntegration } from '@rocket.chat/core-typings';
|
||||
import type { ServerMethods } from '@rocket.chat/ddp-client';
|
||||
import { Integrations } from '@rocket.chat/models';
|
||||
import { removeEmpty } from '@rocket.chat/tools';
|
||||
import { Match, check } from 'meteor/check';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
|
||||
import { hasPermissionAsync } from '../../../lib/authorization/hasPermission';
|
||||
import { methodDeprecationLogger } from '../../../lib/deprecationWarningLogger';
|
||||
import { validateOutgoingIntegration } from '../../../lib/integrations/lib/validateOutgoingIntegration';
|
||||
import { validateScriptEngine } from '../../../lib/integrations/lib/validateScriptEngine';
|
||||
import { notifyOnIntegrationChanged } from '../../../lib/notifyListener';
|
||||
|
||||
declare module '@rocket.chat/ddp-client' {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
interface ServerMethods {
|
||||
addOutgoingIntegration(integration: INewOutgoingIntegration): Promise<IOutgoingIntegration>;
|
||||
}
|
||||
}
|
||||
|
||||
export const addOutgoingIntegration = async (userId: string, integration: INewOutgoingIntegration): Promise<IOutgoingIntegration> => {
|
||||
check(
|
||||
integration,
|
||||
Match.ObjectIncluding({
|
||||
type: String,
|
||||
name: String,
|
||||
enabled: Boolean,
|
||||
username: String,
|
||||
channel: String,
|
||||
alias: Match.Maybe(String),
|
||||
emoji: Match.Maybe(String),
|
||||
scriptEnabled: Boolean,
|
||||
script: Match.Maybe(String),
|
||||
scriptEngine: Match.Maybe(String),
|
||||
urls: Match.Maybe([String]),
|
||||
event: Match.Maybe(String),
|
||||
triggerWords: Match.Maybe([String]),
|
||||
avatar: Match.Maybe(String),
|
||||
token: Match.Maybe(String),
|
||||
impersonateUser: Match.Maybe(Boolean),
|
||||
retryCount: Match.Maybe(Number),
|
||||
retryDelay: Match.Maybe(String),
|
||||
retryFailedCalls: Match.Maybe(Boolean),
|
||||
runOnEdits: Match.Maybe(Boolean),
|
||||
targetRoom: Match.Maybe(String),
|
||||
triggerWordAnywhere: Match.Maybe(Boolean),
|
||||
}),
|
||||
);
|
||||
|
||||
if (
|
||||
!userId ||
|
||||
(!(await hasPermissionAsync(userId, 'manage-outgoing-integrations')) &&
|
||||
!(await hasPermissionAsync(userId, 'manage-own-outgoing-integrations')))
|
||||
) {
|
||||
throw new Meteor.Error('not_authorized');
|
||||
}
|
||||
|
||||
if (integration.script?.trim()) {
|
||||
validateScriptEngine(integration.scriptEngine ?? 'isolated-vm');
|
||||
}
|
||||
|
||||
const integrationData = await validateOutgoingIntegration(integration, userId);
|
||||
|
||||
const { insertedId } = await Integrations.insertOne(removeEmpty(integrationData));
|
||||
|
||||
const integrationStored = await Integrations.findOne({ _id: insertedId });
|
||||
|
||||
if (!integrationStored) {
|
||||
throw new Error('Error inserting integration');
|
||||
}
|
||||
|
||||
void notifyOnIntegrationChanged({ ...integrationStored, _id: insertedId }, 'inserted');
|
||||
|
||||
return integrationStored as IOutgoingIntegration;
|
||||
};
|
||||
|
||||
Meteor.methods<ServerMethods>({
|
||||
async addOutgoingIntegration(integration: INewOutgoingIntegration): Promise<IOutgoingIntegration> {
|
||||
methodDeprecationLogger.method('addOutgoingIntegration', '9.0.0', '/v1/integrations.create');
|
||||
const { userId } = this;
|
||||
if (!userId) {
|
||||
throw new Meteor.Error('Invalid User');
|
||||
}
|
||||
|
||||
return addOutgoingIntegration(userId, integration);
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,62 @@
|
||||
import type { ServerMethods } from '@rocket.chat/ddp-client';
|
||||
import { Integrations, IntegrationHistory } from '@rocket.chat/models';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
|
||||
import { hasPermissionAsync } from '../../../lib/authorization/hasPermission';
|
||||
import { methodDeprecationLogger } from '../../../lib/deprecationWarningLogger';
|
||||
import { notifyOnIntegrationChanged } from '../../../lib/notifyListener';
|
||||
|
||||
declare module '@rocket.chat/ddp-client' {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
interface ServerMethods {
|
||||
deleteOutgoingIntegration(integrationId: string): Promise<boolean>;
|
||||
}
|
||||
}
|
||||
|
||||
export const deleteOutgoingIntegration = async (integrationId: string, userId: string): Promise<void> => {
|
||||
if (!userId) {
|
||||
throw new Meteor.Error('not_authorized', 'Unauthorized', {
|
||||
method: 'deleteOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
const canManageAllIntegrations = await hasPermissionAsync(userId, 'manage-outgoing-integrations');
|
||||
const canManageOwnIntegrations = !canManageAllIntegrations && (await hasPermissionAsync(userId, 'manage-own-outgoing-integrations'));
|
||||
|
||||
if (!canManageAllIntegrations && !canManageOwnIntegrations) {
|
||||
throw new Meteor.Error('not_authorized', 'Unauthorized', {
|
||||
method: 'deleteOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
const integration = await Integrations.removeByIdAndCreatedByIfExists({
|
||||
_id: integrationId,
|
||||
...(canManageOwnIntegrations && { createdBy: userId }),
|
||||
});
|
||||
|
||||
if (!integration) {
|
||||
throw new Meteor.Error('error-invalid-integration', 'Invalid integration', {
|
||||
method: 'deleteOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
// Don't sending to IntegrationHistory listener since it don't waits for 'removed' events.
|
||||
await IntegrationHistory.removeByIntegrationId(integrationId);
|
||||
void notifyOnIntegrationChanged(integration, 'removed');
|
||||
};
|
||||
|
||||
Meteor.methods<ServerMethods>({
|
||||
async deleteOutgoingIntegration(integrationId) {
|
||||
methodDeprecationLogger.method('deleteOutgoingIntegration', '9.0.0', '/v1/integrations.remove');
|
||||
const userId = Meteor.userId();
|
||||
if (!userId) {
|
||||
throw new Meteor.Error('not_authorized', 'Unauthorized', {
|
||||
method: 'deleteOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
await deleteOutgoingIntegration(integrationId, userId);
|
||||
|
||||
return true;
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,23 @@
|
||||
import type { ServerMethods } from '@rocket.chat/ddp-client';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
|
||||
import { methodDeprecationLogger } from '../../../lib/deprecationWarningLogger';
|
||||
import { replayOutgoingIntegrationMethod } from '../../../lib/integrations/functions/clearIntegrationHistory';
|
||||
|
||||
declare module '@rocket.chat/ddp-client' {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
interface ServerMethods {
|
||||
replayOutgoingIntegration(params: { integrationId: string; historyId: string }): Promise<boolean>;
|
||||
}
|
||||
}
|
||||
|
||||
Meteor.methods<ServerMethods>({
|
||||
async replayOutgoingIntegration({ integrationId, historyId }) {
|
||||
methodDeprecationLogger.method('replayOutgoingIntegration', '9.0.0', '/v1/integrations.replayOutgoing');
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('not_authorized', 'Unauthorized', { method: 'replayOutgoingIntegration' });
|
||||
}
|
||||
await replayOutgoingIntegrationMethod(this.userId, { integrationId, historyId });
|
||||
return true;
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,132 @@
|
||||
import type { IIntegration, INewOutgoingIntegration, IUpdateOutgoingIntegration } from '@rocket.chat/core-typings';
|
||||
import type { ServerMethods } from '@rocket.chat/ddp-client';
|
||||
import { Integrations, Users } from '@rocket.chat/models';
|
||||
import { wrapExceptions } from '@rocket.chat/tools';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
|
||||
import { hasPermissionAsync } from '../../../lib/authorization/hasPermission';
|
||||
import { methodDeprecationLogger } from '../../../lib/deprecationWarningLogger';
|
||||
import { validateOutgoingIntegration } from '../../../lib/integrations/lib/validateOutgoingIntegration';
|
||||
import { isScriptEngineFrozen, validateScriptEngine } from '../../../lib/integrations/lib/validateScriptEngine';
|
||||
import { notifyOnIntegrationChanged } from '../../../lib/notifyListener';
|
||||
|
||||
declare module '@rocket.chat/ddp-client' {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
interface ServerMethods {
|
||||
updateOutgoingIntegration(
|
||||
integrationId: string,
|
||||
integration: INewOutgoingIntegration | IUpdateOutgoingIntegration,
|
||||
): IIntegration | null;
|
||||
}
|
||||
}
|
||||
|
||||
export const updateOutgoingIntegration = async (
|
||||
userId: string,
|
||||
integrationId: string,
|
||||
_integration: INewOutgoingIntegration | IUpdateOutgoingIntegration,
|
||||
): Promise<IIntegration | null> => {
|
||||
const integration = await validateOutgoingIntegration(_integration, userId);
|
||||
|
||||
if (!integration.token || integration.token.trim() === '') {
|
||||
throw new Meteor.Error('error-invalid-token', 'Invalid token', {
|
||||
method: 'updateOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
let currentIntegration: IIntegration | null;
|
||||
|
||||
if (await hasPermissionAsync(userId, 'manage-outgoing-integrations')) {
|
||||
currentIntegration = await Integrations.findOneById(integrationId);
|
||||
} else if (await hasPermissionAsync(userId, 'manage-own-outgoing-integrations')) {
|
||||
currentIntegration = await Integrations.findOne({
|
||||
'_id': integrationId,
|
||||
'_createdBy._id': userId,
|
||||
});
|
||||
} else {
|
||||
throw new Meteor.Error('not_authorized', 'Unauthorized', {
|
||||
method: 'updateOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
if (!currentIntegration) {
|
||||
throw new Meteor.Error('invalid_integration', '[methods] updateOutgoingIntegration -> integration not found');
|
||||
}
|
||||
|
||||
const oldScriptEngine = currentIntegration.scriptEngine;
|
||||
const scriptEngine = integration.scriptEngine ?? oldScriptEngine ?? 'isolated-vm';
|
||||
if (
|
||||
integration.script?.trim() &&
|
||||
(scriptEngine !== oldScriptEngine || integration.script?.trim() !== currentIntegration.script?.trim())
|
||||
) {
|
||||
wrapExceptions(() => validateScriptEngine(scriptEngine)).catch((e) => {
|
||||
throw new Meteor.Error(e.message);
|
||||
});
|
||||
}
|
||||
|
||||
const isFrozen = isScriptEngineFrozen(scriptEngine);
|
||||
|
||||
const updatedIntegration = await Integrations.findOneAndUpdate(
|
||||
{ _id: integrationId },
|
||||
{
|
||||
$set: {
|
||||
event: integration.event,
|
||||
enabled: integration.enabled,
|
||||
name: integration.name,
|
||||
avatar: integration.avatar,
|
||||
emoji: integration.emoji,
|
||||
alias: integration.alias,
|
||||
channel: typeof integration.channel === 'string' ? [integration.channel] : integration.channel,
|
||||
targetRoom: integration.targetRoom,
|
||||
impersonateUser: integration.impersonateUser,
|
||||
username: integration.username,
|
||||
userId: integration.userId,
|
||||
urls: integration.urls,
|
||||
token: integration.token,
|
||||
...(isFrozen
|
||||
? {}
|
||||
: {
|
||||
script: integration.script,
|
||||
scriptEnabled: integration.scriptEnabled,
|
||||
scriptEngine,
|
||||
skipTranspile: integration.skipTranspile,
|
||||
...(integration.scriptCompiled ? { scriptCompiled: integration.scriptCompiled } : { scriptError: integration.scriptError }),
|
||||
}),
|
||||
triggerWords: integration.triggerWords,
|
||||
retryFailedCalls: integration.retryFailedCalls,
|
||||
retryCount: integration.retryCount,
|
||||
retryDelay: integration.retryDelay,
|
||||
triggerWordAnywhere: integration.triggerWordAnywhere,
|
||||
runOnEdits: integration.runOnEdits,
|
||||
_updatedAt: new Date(),
|
||||
_updatedBy: await Users.findOne({ _id: userId }, { projection: { username: 1 } }),
|
||||
},
|
||||
...(isFrozen
|
||||
? {}
|
||||
: {
|
||||
$unset: {
|
||||
...(integration.scriptCompiled ? { scriptError: 1 as const } : { scriptCompiled: 1 as const }),
|
||||
},
|
||||
}),
|
||||
},
|
||||
{ returnDocument: 'after' },
|
||||
);
|
||||
|
||||
if (updatedIntegration) {
|
||||
await notifyOnIntegrationChanged(updatedIntegration);
|
||||
}
|
||||
|
||||
return updatedIntegration;
|
||||
};
|
||||
|
||||
Meteor.methods<ServerMethods>({
|
||||
async updateOutgoingIntegration(integrationId, _integration) {
|
||||
methodDeprecationLogger.method('updateOutgoingIntegration', '9.0.0', '/v1/integrations.update');
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('error-invalid-user', 'Invalid user', {
|
||||
method: 'updateOutgoingIntegration',
|
||||
});
|
||||
}
|
||||
|
||||
return updateOutgoingIntegration(this.userId, integrationId, _integration);
|
||||
},
|
||||
});
|
||||
Reference in New Issue
Block a user