n8n 2.5.1 → 2.6.0

package/dist/active-executions.d.ts

@@ -16,7 +16,7 @@ export declare class ActiveExecutions {
     private activeExecutions;
     constructor(logger: Logger, executionRepository: ExecutionRepository, concurrencyControl: ConcurrencyControlService, eventService: EventService, executionsConfig: ExecutionsConfig);
     has(executionId: string): boolean;
-    add(executionData: IWorkflowExecutionDataProcess, executionId?: string): Promise<string>;
+    add(executionData: IWorkflowExecutionDataProcess, maybeExecutionId?: string): Promise<string>;
     attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>): void;
     attachResponsePromise(executionId: string, responsePromise: IDeferredPromise<IExecuteResponsePromiseData>): void;
     resolveResponsePromise(executionId: string, response: IExecuteResponsePromiseData): void;

package/dist/active-executions.js

@@ -21,6 +21,7 @@ const execution_already_resuming_error_1 = require("./errors/execution-already-r
 const utils_1 = require("./utils");
 const concurrency_control_service_1 = require("./concurrency/concurrency-control.service");
 const event_service_1 = require("./events/event.service");
+const concurrency_capacity_reservation_1 = require("./concurrency/concurrency-capacity-reservation");
 let ActiveExecutions = class ActiveExecutions {
     constructor(logger, executionRepository, concurrencyControl, eventService, executionsConfig) {
         this.logger = logger;
@@ -33,44 +34,52 @@ let ActiveExecutions = class ActiveExecutions {
     has(executionId) {
         return this.activeExecutions[executionId] !== undefined;
     }
-    async add(executionData, executionId) {
-        let executionStatus = executionId ? 'running' : 'new';
+    async add(executionData, maybeExecutionId) {
+        let executionStatus = maybeExecutionId ? 'running' : 'new';
         const mode = executionData.executionMode;
-        if (executionId === undefined) {
-            const fullExecutionData = {
-                data: executionData.executionData,
-                mode,
-                finished: false,
-                workflowData: executionData.workflowData,
-                status: executionStatus,
-                workflowId: executionData.workflowData.id,
-            };
-            fullExecutionData.retryOf = executionData.retryOf ?? undefined;
-            const workflowId = executionData.workflowData.id;
-            if (workflowId !== undefined && (0, utils_1.isWorkflowIdValid)(workflowId)) {
-                fullExecutionData.workflowId = workflowId;
+        const capacityReservation = new concurrency_capacity_reservation_1.ConcurrencyCapacityReservation(this.concurrencyControl);
+        try {
+            if (maybeExecutionId === undefined) {
+                const fullExecutionData = {
+                    data: executionData.executionData,
+                    mode,
+                    finished: false,
+                    workflowData: executionData.workflowData,
+                    status: executionStatus,
+                    workflowId: executionData.workflowData.id,
+                    retryOf: executionData.retryOf ?? undefined,
+                };
+                const workflowId = executionData.workflowData.id;
+                if (workflowId !== undefined && (0, utils_1.isWorkflowIdValid)(workflowId)) {
+                    fullExecutionData.workflowId = workflowId;
+                }
+                maybeExecutionId = await this.executionRepository.createNewExecution(fullExecutionData);
+                (0, node_assert_1.strict)(maybeExecutionId);
+                await capacityReservation.reserve({ mode, executionId: maybeExecutionId });
+                if (this.executionsConfig.mode === 'regular') {
+                    await this.executionRepository.setRunning(maybeExecutionId);
+                }
+                executionStatus = 'running';
             }
-            executionId = await this.executionRepository.createNewExecution(fullExecutionData);
-            (0, node_assert_1.strict)(executionId);
-            if (this.executionsConfig.mode === 'regular') {
-                await this.concurrencyControl.throttle({ mode, executionId });
-                await this.executionRepository.setRunning(executionId);
+            else {
+                await capacityReservation.reserve({ mode, executionId: maybeExecutionId });
+                const execution = {
+                    id: maybeExecutionId,
+                    data: executionData.executionData,
+                    waitTill: null,
+                    status: executionStatus,
+                };
+                const updateSucceeded = await this.executionRepository.updateExistingExecution(maybeExecutionId, execution, 'waiting');
+                if (!updateSucceeded) {
+                    throw new execution_already_resuming_error_1.ExecutionAlreadyResumingError(maybeExecutionId);
+                }
             }
-            executionStatus = 'running';
         }
-        else {
-            await this.concurrencyControl.throttle({ mode, executionId });
-            const execution = {
-                id: executionId,
-                data: executionData.executionData,
-                waitTill: null,
-                status: executionStatus,
-            };
-            const updateSucceeded = await this.executionRepository.updateExistingExecution(executionId, execution, 'waiting');
-            if (!updateSucceeded) {
-                throw new execution_already_resuming_error_1.ExecutionAlreadyResumingError(executionId);
-            }
+        catch (error) {
+            capacityReservation.release();
+            throw error;
         }
+        const executionId = maybeExecutionId;
         const resumingExecution = this.activeExecutions[executionId];
         const postExecutePromise = (0, n8n_workflow_1.createDeferredPromise)();
         const execution = {
@@ -89,7 +98,7 @@ let ActiveExecutions = class ActiveExecutions {
             throw error;
         })
             .finally(() => {
-            this.concurrencyControl.release({ mode: executionData.executionMode });
+            capacityReservation.release();
             if (execution.status === 'waiting') {
                 delete execution.workflowExecution;
             }

package/dist/active-executions.js.map

@@ -1 +1 @@
-{"version":3,"file":"active-executions.js","sourceRoot":"","sources":["../src/active-executions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"active-executions.js","sourceRoot":"","sources":["../src/active-executions.ts"],"names":[],"mappings":"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"}

package/dist/auth/auth.service.d.ts

@@ -25,6 +25,10 @@ export declare class AuthService {
     private skipBrowserIdCheckEndpoints;
     constructor(globalConfig: GlobalConfig, logger: Logger, license: License, jwtService: JwtService, urlService: UrlService, userRepository: UserRepository, invalidAuthTokenRepository: InvalidAuthTokenRepository, mfaService: MfaService);
     createAuthMiddleware({ allowSkipMFA, allowSkipPreviewAuth, allowUnauthenticated, }: CreateAuthMiddlewareOptions): (req: AuthenticatedRequest, res: Response, next: NextFunction) => Promise<void>;
+    getCookieToken(req: AuthenticatedRequest): string | undefined;
+    getBrowserId(req: AuthenticatedRequest): string | undefined;
+    getMethod(req: AuthenticatedRequest): string;
+    getEndpoint(req: AuthenticatedRequest): string;
     clearCookie(res: Response): void;
     invalidateToken(req: AuthenticatedRequest): Promise<void>;
     issueCookie(res: Response, user: User, usedMfa: boolean, browserId?: string): void;

package/dist/auth/auth.service.js

@@ -97,6 +97,18 @@ let AuthService = class AuthService {
                 res.status(401).json({ status: 'error', message: 'Unauthorized' });
         };
     }
+    getCookieToken(req) {
+        return req.cookies[constants_1.AUTH_COOKIE_NAME];
+    }
+    getBrowserId(req) {
+        return req.browserId;
+    }
+    getMethod(req) {
+        return req.method;
+    }
+    getEndpoint(req) {
+        return req.route ? `${req.baseUrl}${req.route.path}` : req.baseUrl;
+    }
     clearCookie(res) {
         res.clearCookie(constants_1.AUTH_COOKIE_NAME);
     }
@@ -155,18 +167,19 @@ let AuthService = class AuthService {
             jwtPayload.hash !== this.createJWTHash(user)) {
             throw new auth_error_1.AuthError('Unauthorized');
         }
-        const endpoint = req.route ? `${req.baseUrl}${req.route.path}` : req.baseUrl;
+        const browserId = this.getBrowserId(req);
+        const endpoint = this.getEndpoint(req);
         if (req.method === 'GET' && this.skipBrowserIdCheckEndpoints.includes(endpoint)) {
             this.logger.debug(`Skipped browserId check on ${endpoint}`);
         }
         else if (jwtPayload.browserId &&
-            (!req.browserId || jwtPayload.browserId !== this.hash(req.browserId))) {
+            (!browserId || jwtPayload.browserId !== this.hash(browserId))) {
             this.logger.warn(`browserId check failed on ${endpoint}`);
             throw new auth_error_1.AuthError('Unauthorized');
         }
         if (jwtPayload.exp * 1000 - Date.now() < this.jwtRefreshTimeout) {
             this.logger.debug('JWT about to expire. Will be refreshed');
-            this.issueCookie(res, user, jwtPayload.usedMfa ?? false, req.browserId);
+            this.issueCookie(res, user, jwtPayload.usedMfa ?? false, browserId);
         }
         return [user, { usedMfa: jwtPayload.usedMfa ?? false }];
     }

package/dist/auth/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}

package/dist/auth/methods/email.js

@@ -5,8 +5,8 @@ const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const auth_error_1 = require("../../errors/response-errors/auth.error");
 const event_service_1 = require("../../events/event.service");
-const helpers_ee_1 = require("../../ldap.ee/helpers.ee");
 const password_utility_1 = require("../../services/password.utility");
+const config_1 = require("@n8n/config");
 const handleEmailLogin = async (email, password) => {
     const user = await di_1.Container.get(db_1.UserRepository).findOne({
         where: { email },
@@ -16,7 +16,7 @@ const handleEmailLogin = async (email, password) => {
         return user;
     }
     const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
-    if (user && ldapIdentity && !(0, helpers_ee_1.isLdapLoginEnabled)()) {
+    if (user && ldapIdentity && !di_1.Container.get(config_1.GlobalConfig).sso.ldap.loginEnabled) {
         di_1.Container.get(event_service_1.EventService).emit('login-failed-due-to-ldap-disabled', { userId: user.id });
         throw new auth_error_1.AuthError('Reset your password to gain access to the instance.');
     }

package/dist/auth/methods/email.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/auth/methods/email.ts"],"names":[],"mappings":";;;AACA,gCAAyC;AACzC,gCAAoC;AAEpC,oEAAgE;AAChE,0DAAsD;AACtD,qDAA0D;AAC1D,kEAA8D;AAEvD,MAAM,gBAAgB,GAAG,KAAK,EACpC,KAAa,EACb,QAAgB,EACY,EAAE;IAC9B,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,OAAO,CAAC;QACxD,KAAK,EAAE,EAAE,KAAK,EAAE;QAChB,SAAS,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC;KACrC,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE,QAAQ,IAAI,CAAC,MAAM,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAC;IACb,CAAC;IAID,MAAM,YAAY,GAAG,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC;IAClF,IAAI,IAAI,IAAI,YAAY,IAAI,CAAC,IAAA,+BAAkB,GAAE,EAAE,CAAC;QACnD,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3F,MAAM,IAAI,sBAAS,CAAC,qDAAqD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAvBW,QAAA,gBAAgB,oBAuB3B"}
+{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/auth/methods/email.ts"],"names":[],"mappings":";;;AACA,gCAAyC;AACzC,gCAAoC;AAEpC,oEAAgE;AAChE,0DAAsD;AACtD,kEAA8D;AAC9D,wCAA2C;AAEpC,MAAM,gBAAgB,GAAG,KAAK,EACpC,KAAa,EACb,QAAgB,EACY,EAAE;IAC9B,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,OAAO,CAAC;QACxD,KAAK,EAAE,EAAE,KAAK,EAAE;QAChB,SAAS,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC;KACrC,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE,QAAQ,IAAI,CAAC,MAAM,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAC;IACb,CAAC;IAID,MAAM,YAAY,GAAG,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC;IAClF,IAAI,IAAI,IAAI,YAAY,IAAI,CAAC,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAChF,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3F,MAAM,IAAI,sBAAS,CAAC,qDAAqD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAvBW,QAAA,gBAAgB,oBAuB3B"}