houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit workflow and serverless throttling (#15648)

Browse Source 
Serverless:  1000 / min.

Workflows: 100 / min. This is a security in case of infinite loops.
This commit is contained in:
Thomas Trompette
2025-11-06 17:47:27 +01:00
committed by GitHub
parent 931d12c77b
commit 33c08ad437
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/core-modules/throttler/throttler.service.ts
-13
View File
@@ -15,19 +15,6 @@ export class ThrottlerService {
private readonly cacheStorage: CacheStorageService,
) {}
async throttle(key: string, limit: number, ttl: number): Promise<void> {
const currentCount = (await this.cacheStorage.get<number>(key)) ?? 0;
if (currentCount >= limit) {
throw new ThrottlerException(
'Limit reached',
ThrottlerExceptionCode.LIMIT_REACHED,
);
}
await this.cacheStorage.set(key, currentCount + 1, ttl);
}
async tokenBucketThrottleOrThrow(
key: string,
tokensToConsume: number,
packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
+4 -4
View File
@@ -468,7 +468,7 @@ export class ConfigVariables {
type: ConfigVariableType.NUMBER,
})
@CastToPositiveNumber()
SERVERLESS_FUNCTION_EXEC_THROTTLE_LIMIT = 10;
SERVERLESS_FUNCTION_EXEC_THROTTLE_LIMIT = 1000;
// milliseconds
@ConfigVariablesMetadata({
@@ -477,7 +477,7 @@ export class ConfigVariables {
type: ConfigVariableType.NUMBER,
})
@CastToPositiveNumber()
SERVERLESS_FUNCTION_EXEC_THROTTLE_TTL = 1000;
SERVERLESS_FUNCTION_EXEC_THROTTLE_TTL = 60_000;
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.SERVERLESS_CONFIG,
@@ -1179,7 +1179,7 @@ export class ConfigVariables {
type: ConfigVariableType.NUMBER,
})
@CastToPositiveNumber()
WORKFLOW_EXEC_THROTTLE_LIMIT = 10;
WORKFLOW_EXEC_THROTTLE_LIMIT = 100;
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.RATE_LIMITING,
@@ -1187,7 +1187,7 @@ export class ConfigVariables {
type: ConfigVariableType.NUMBER,
})
@CastToPositiveNumber()
WORKFLOW_EXEC_THROTTLE_TTL = 1000;
WORKFLOW_EXEC_THROTTLE_TTL = 60_000;
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.CAPTCHA_CONFIG,
packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts
+2 -1
View File
@@ -458,8 +458,9 @@ export class ServerlessFunctionService {
private async throttleExecution(workspaceId: string) {
try {
await this.throttlerService.throttle(
await this.throttlerService.tokenBucketThrottleOrThrow(
`${workspaceId}-serverless-function-execution`,
1,
this.twentyConfigService.get('SERVERLESS_FUNCTION_EXEC_THROTTLE_LIMIT'),
this.twentyConfigService.get('SERVERLESS_FUNCTION_EXEC_THROTTLE_TTL'),
);
packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts
+2 -1
View File
@@ -172,8 +172,9 @@ export class RunWorkflowJob {
private async throttleExecution(workflowId: string) {
try {
await this.throttlerService.throttle(
await this.throttlerService.tokenBucketThrottleOrThrow(
`${workflowId}-workflow-execution`,
1,
this.twentyConfigService.get('WORKFLOW_EXEC_THROTTLE_LIMIT'),
this.twentyConfigService.get('WORKFLOW_EXEC_THROTTLE_TTL'),
);