n8n 2.37.6 → 2.38.1

package/dist/modules/dynamic-credentials.ee/services/credential-connection-status.service.js

@@ -112,23 +112,41 @@ let CredentialConnectionStatusService = class CredentialConnectionStatusService
         const userById = new Map(users.map((u) => [u.id, u]));
         const pairsToCheck = uniquePairs.filter((p) => userById.has(p.userId));
         let projectRetainedKeys = new Set();
+        let globallyConnectableCredentialIds = new Set();
         if (pairsToCheck.length > 0) {
-            const validCredRoles = await this.roleService.rolesWithScope('credential', CREDENTIAL_RETAIN_SCOPE, em);
-            const projectRetained = await this.sharedCredentialsRepository.findPairsWithCredentialAccess(pairsToCheck, CREDENTIAL_RETAIN_SCOPE, validCredRoles, em);
+            const credentialIds = [...new Set(pairsToCheck.map((p) => p.credentialId))];
+            const [projectRetained, globallyConnectableCredentials] = await Promise.all([
+                (async () => {
+                    const validCredRoles = await this.roleService.rolesWithScope('credential', CREDENTIAL_RETAIN_SCOPE, em);
+                    return await this.sharedCredentialsRepository.findPairsWithCredentialAccess(pairsToCheck, CREDENTIAL_RETAIN_SCOPE, validCredRoles, em);
+                })(),
+                em.find(db_1.CredentialsEntity, {
+                    where: {
+                        id: (0, db_1.In)(credentialIds),
+                        isGlobal: true,
+                        usageScope: 'project',
+                        isResolvable: true,
+                    },
+                    select: ['id'],
+                }),
+            ]);
             projectRetainedKeys = new Set(projectRetained.map(keyOf));
+            globallyConnectableCredentialIds = new Set(globallyConnectableCredentials.map((c) => c.id));
         }
-        const toDelete = this.selectOrphanedPairs(uniquePairs, userById, projectRetainedKeys);
+        const toDelete = this.selectOrphanedPairs(uniquePairs, userById, projectRetainedKeys, globallyConnectableCredentialIds);
         if (toDelete.length > 0) {
             await this.repository.deleteByPairs(toDelete, em);
         }
     }
-    selectOrphanedPairs(pairs, userById, projectRetainedKeys) {
+    selectOrphanedPairs(pairs, userById, projectRetainedKeys, globallyConnectableCredentialIds) {
         return pairs.filter((pair) => {
             const user = userById.get(pair.userId);
             if (!user)
                 return true;
             if ((0, permissions_1.hasGlobalScope)(user, CREDENTIAL_RETAIN_SCOPE))
                 return false;
+            if (globallyConnectableCredentialIds.has(pair.credentialId))
+                return false;
             return !projectRetainedKeys.has(keyOf(pair));
         });
     }

package/dist/modules/dynamic-credentials.ee/services/credential-connection-status.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-connection-status.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-connection-status.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credential-connection-status.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-connection-status.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.d.ts

@@ -42,6 +42,7 @@ export declare class DynamicCredentialResolverService {
     }>>;
     delete(id: string): Promise<void>;
     private validateConfig;
+    private restoreRedactedSecrets;
     private encryptConfig;
     private decryptConfig;
     private withDecryptedConfig;

package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.js

@@ -19,6 +19,7 @@ const typeorm_1 = require("@n8n/typeorm");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const active_workflow_manager_1 = require("../../../active-workflow-manager");
+const config_redaction_1 = require("../config-redaction");
 const constants_1 = require("../constants");
 const credential_resolver_registry_service_1 = require("./credential-resolver-registry.service");
 const resolver_config_expression_service_1 = require("./resolver-config-expression.service");
@@ -93,8 +94,9 @@ let DynamicCredentialResolverService = class DynamicCredentialResolverService {
             }
         }
         if (params.config !== undefined) {
-            await this.validateConfig(existing.type, params.config, canUseExternalSecrets);
-            existing.config = await this.encryptConfig(params.config);
+            const config = await this.restoreRedactedSecrets(existing, params.config);
+            await this.validateConfig(existing.type, config, canUseExternalSecrets);
+            existing.config = await this.encryptConfig(config);
         }
         if (params.name !== undefined) {
             existing.name = params.name;
@@ -172,6 +174,14 @@ let DynamicCredentialResolverService = class DynamicCredentialResolverService {
         }
         await resolverImplementation.validateOptions(resolvedConfig);
     }
+    async restoreRedactedSecrets(existing, incoming) {
+        const secretFields = (0, config_redaction_1.collectSecretFieldNames)(this.registry.getResolverByTypename(existing.type)?.metadata.options);
+        if (secretFields.size === 0) {
+            return incoming;
+        }
+        const stored = await this.decryptConfig(existing.config);
+        return (0, config_redaction_1.restoreSecretConfig)(incoming, stored, secretFields);
+    }
     async encryptConfig(config) {
         return await this.cipher.encryptV2(config);
     }

package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-resolver.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credential-resolver.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/encryption-key-manager/key-manager.service.d.ts

@@ -1,6 +1,7 @@
 import type { ListEncryptionKeysQueryDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { DeploymentKeyRepository, type DeploymentKey } from '@n8n/db';
-import { Cipher, type CipherAlgorithm } from 'n8n-core';
+import { Cipher, InstanceSettings, type CipherAlgorithm } from 'n8n-core';
 type KeyInfo = {
     id: string;
     value: string;
@@ -9,11 +10,15 @@ type KeyInfo = {
 export declare class KeyManagerService {
     private readonly deploymentKeyRepository;
     private readonly cipher;
-    constructor(deploymentKeyRepository: DeploymentKeyRepository, cipher: Cipher);
+    private readonly instanceSettings;
+    private readonly logger;
+    private cachedInstanceKeyInfo?;
+    constructor(deploymentKeyRepository: DeploymentKeyRepository, cipher: Cipher, instanceSettings: InstanceSettings, logger: Logger);
     getActiveKey(): Promise<KeyInfo>;
     getKeyById(id: string): Promise<KeyInfo | null>;
     getLegacyKey(): Promise<KeyInfo>;
     bootstrapLegacyCbcKey(instanceEncryptionKey: string): Promise<void>;
+    private instanceKeyLegacyInfo;
     bootstrapGcmKey(): Promise<void>;
     listKeys(query: ListEncryptionKeysQueryDto): Promise<{
         items: DeploymentKey[];

package/dist/modules/encryption-key-manager/key-manager.service.js

@@ -10,15 +10,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeyManagerService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const node_crypto_1 = require("node:crypto");
 const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 let KeyManagerService = class KeyManagerService {
-    constructor(deploymentKeyRepository, cipher) {
+    constructor(deploymentKeyRepository, cipher, instanceSettings, logger) {
         this.deploymentKeyRepository = deploymentKeyRepository;
         this.cipher = cipher;
+        this.instanceSettings = instanceSettings;
+        this.logger = logger;
     }
     async getActiveKey() {
         const activeKeys = await this.deploymentKeyRepository.find({
@@ -40,13 +43,21 @@ let KeyManagerService = class KeyManagerService {
         return { id: key.id, value: key.value, algorithm: key.algorithm };
     }
     async getLegacyKey() {
-        const key = await this.deploymentKeyRepository.findOne({
-            where: { type: 'data_encryption', algorithm: 'aes-256-cbc' },
-        });
-        if (!key) {
-            throw new not_found_error_1.NotFoundError('No legacy aes-256-cbc encryption key found');
+        try {
+            const key = await this.deploymentKeyRepository.findOne({
+                where: { type: 'data_encryption', algorithm: 'aes-256-cbc' },
+            });
+            if (key) {
+                return { id: key.id, value: key.value, algorithm: key.algorithm };
+            }
+            if (!this.cachedInstanceKeyInfo) {
+                this.logger.warn('Legacy aes-256-cbc encryption key not found; falling back to instance key');
+            }
         }
-        return { id: key.id, value: key.value, algorithm: key.algorithm };
+        catch (error) {
+            this.logger.warn('Key store unavailable while reading legacy key; using the instance key directly', { error });
+        }
+        return this.instanceKeyLegacyInfo();
     }
     async bootstrapLegacyCbcKey(instanceEncryptionKey) {
         const existing = await this.deploymentKeyRepository.findOne({
@@ -63,6 +74,14 @@ let KeyManagerService = class KeyManagerService {
         });
         await this.deploymentKeyRepository.save(entity);
     }
+    instanceKeyLegacyInfo() {
+        this.cachedInstanceKeyInfo ??= {
+            id: 'instance-key',
+            value: this.cipher.encryptDEKWithInstanceKey(this.instanceSettings.encryptionKey),
+            algorithm: 'aes-256-cbc',
+        };
+        return this.cachedInstanceKeyInfo;
+    }
     async bootstrapGcmKey() {
         const existing = await this.deploymentKeyRepository.findOne({
             where: { type: 'data_encryption', algorithm: 'aes-256-gcm', status: 'active' },
@@ -122,6 +141,6 @@ let KeyManagerService = class KeyManagerService {
 exports.KeyManagerService = KeyManagerService;
 exports.KeyManagerService = KeyManagerService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [db_1.DeploymentKeyRepository, n8n_core_1.Cipher])
+    __metadata("design:paramtypes", [db_1.DeploymentKeyRepository, n8n_core_1.Cipher, n8n_core_1.InstanceSettings, backend_common_1.Logger])
 ], KeyManagerService);
 //# sourceMappingURL=key-manager.service.js.map

package/dist/modules/encryption-key-manager/key-manager.service.js.map

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

package/dist/modules/engine-v2/engine-control-plane-auth.middleware.d.ts

@@ -0,0 +1,6 @@
+import type { Logger } from '@n8n/backend-common';
+import type { EngineConfig } from '@n8n/config';
+import type { NextFunction, Request, Response } from 'express';
+type SyncRequestHandler = (req: Request, res: Response, next: NextFunction) => void;
+export declare function createEngineControlPlaneAuthMiddleware(engineConfig: EngineConfig, logger: Logger): SyncRequestHandler;
+export {};

package/dist/modules/engine-v2/engine-control-plane-auth.middleware.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEngineControlPlaneAuthMiddleware = createEngineControlPlaneAuthMiddleware;
+const engine_1 = require("@n8n/engine");
+const unauthenticated_error_1 = require("../../errors/response-errors/unauthenticated.error");
+const BEARER_PREFIX = /^bearer /i;
+function createEngineControlPlaneAuthMiddleware(engineConfig, logger) {
+    const reject = (req, res, reason) => {
+        logger.warn(`Rejected ${req.method} ${req.originalUrl} - ${reason}`);
+        const error = new unauthenticated_error_1.UnauthenticatedError();
+        res.status(error.httpStatusCode).json({ code: error.errorCode, message: error.message });
+    };
+    return (req, res, next) => {
+        const header = req.header('authorization') ?? '';
+        if (!BEARER_PREFIX.test(header)) {
+            reject(req, res, 'no bearer token');
+            return;
+        }
+        try {
+            (0, engine_1.verifyActionToken)(engineConfig.authSecret, header.replace(BEARER_PREFIX, ''), 'lifecycle-events:write');
+        }
+        catch (error) {
+            if (!(error instanceof engine_1.InvalidActionTokenError))
+                throw error;
+            reject(req, res, 'token rejected');
+            return;
+        }
+        next();
+    };
+}
+//# sourceMappingURL=engine-control-plane-auth.middleware.js.map

package/dist/modules/engine-v2/engine-control-plane-auth.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine-control-plane-auth.middleware.js","sourceRoot":"","sources":["../../../src/modules/engine-v2/engine-control-plane-auth.middleware.ts"],"names":[],"mappings":";;;AAEA,wCAAyE;AAGzE,0FAAsF;AAEtF,MAAM,aAAa,GAAG,WAAW,CAAC;AASlC,gDACC,YAA0B,EAC1B,MAAc;IAEd,MAAM,MAAM,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,MAAc,EAAQ,EAAE;QAEpE,MAAM,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,MAAM,MAAM,EAAE,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,4CAAoB,EAAE,CAAC;QACzC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1F,CAAC,CAAC;IAEF,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;YACpC,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,IAAA,0BAAiB,EAChB,YAAY,CAAC,UAAU,EACvB,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,EACjC,wBAAwB,CACxB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gCAAuB,CAAC;gBAAE,MAAM,KAAK,CAAC;YAC7D,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;YACnC,OAAO;QACR,CAAC;QAED,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;AACH,CAAC"}

package/dist/modules/engine-v2/engine-control-plane-client.d.ts

@@ -0,0 +1,9 @@
+import { OutboundHttp } from '@n8n/backend-network';
+import { EngineConfig } from '@n8n/config';
+import type { LifecycleEvent } from '@n8n/engine';
+export declare class EngineControlPlaneClient {
+    private readonly engineConfig;
+    private readonly http;
+    constructor(engineConfig: EngineConfig, outboundHttp: OutboundHttp);
+    sendLifecycleEvents(events: LifecycleEvent[], signal: AbortSignal): Promise<void>;
+}

package/dist/modules/engine-v2/engine-control-plane-client.js

@@ -0,0 +1,51 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EngineControlPlaneClient = void 0;
+const backend_network_1 = require("@n8n/backend-network");
+const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
+const engine_1 = require("@n8n/engine");
+const n8n_workflow_1 = require("n8n-workflow");
+const engine_v2_constants_1 = require("./engine-v2.constants");
+let EngineControlPlaneClient = class EngineControlPlaneClient {
+    constructor(engineConfig, outboundHttp) {
+        this.engineConfig = engineConfig;
+        this.http = outboundHttp.requests({
+            useDefaultSsrfPolicy: 'unsafe',
+            baseURL: engineConfig.controlPlaneBaseUrl || `http://127.0.0.1:${engineConfig.controlPlanePort}`,
+            headers: () => ({
+                authorization: `Bearer ${(0, engine_1.mintActionToken)(this.engineConfig.authSecret, 'lifecycle-events:write')}`,
+            }),
+        });
+    }
+    async sendLifecycleEvents(events, signal) {
+        const response = await this.http.request({
+            url: engine_v2_constants_1.STATUS_CALLBACK_PATH,
+            method: 'POST',
+            body: { events },
+            json: true,
+            returnFullResponse: true,
+            ignoreHttpStatusErrors: true,
+            disableFollowRedirect: true,
+            abortSignal: signal,
+        });
+        if (response.statusCode >= 300) {
+            throw new n8n_workflow_1.OperationalError(`Control plane refused a lifecycle event batch with ${response.statusCode}`);
+        }
+    }
+};
+exports.EngineControlPlaneClient = EngineControlPlaneClient;
+exports.EngineControlPlaneClient = EngineControlPlaneClient = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [config_1.EngineConfig, backend_network_1.OutboundHttp])
+], EngineControlPlaneClient);
+//# sourceMappingURL=engine-control-plane-client.js.map

package/dist/modules/engine-v2/engine-control-plane-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine-control-plane-client.js","sourceRoot":"","sources":["../../../src/modules/engine-v2/engine-control-plane-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAAoD;AACpD,wCAA2C;AAC3C,gCAAkC;AAElC,wCAA8C;AAC9C,+CAAgD;AAEhD,+DAA6D;AAOtD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAGpC,YACkB,YAA0B,EAC3C,YAA0B;4BADT,YAAY;QAG7B,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC;YAEjC,oBAAoB,EAAE,QAAQ;YAE9B,OAAO,EACN,YAAY,CAAC,mBAAmB,IAAI,oBAAoB,YAAY,CAAC,gBAAgB,EAAE;YAExF,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;gBACf,aAAa,EAAE,UAAU,IAAA,wBAAe,EAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,wBAAwB,CAAC,EAAE;aAClG,CAAC;SACF,CAAC,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,mBAAmB,CAAC,MAAwB,EAAE,MAAmB;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAU;YACjD,GAAG,EAAE,0CAAoB;YACzB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,IAAI,EAAE,IAAI;YACV,kBAAkB,EAAE,IAAI;YAExB,sBAAsB,EAAE,IAAI;YAE5B,qBAAqB,EAAE,IAAI;YAG3B,WAAW,EAAE,MAAM;SACnB,CAAC,CAAC;QAGH,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,+BAAgB,CACzB,sDAAsD,QAAQ,CAAC,UAAU,EAAE,CAC3E,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAA;;mCA5CY,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAKuB,qBAAY,EAC7B,8BAAY;GALf,wBAAwB,CA4CpC"}

package/dist/modules/engine-v2/engine-control-plane-server.d.ts

@@ -0,0 +1,14 @@
+import { Logger } from '@n8n/backend-common';
+import { EngineConfig } from '@n8n/config';
+import { EngineLifecycleEventController } from './engine-lifecycle-event.controller';
+export declare class EngineControlPlaneServer {
+    private readonly engineConfig;
+    private readonly lifecycleEventController;
+    private readonly logger;
+    private server;
+    get port(): number | undefined;
+    constructor(engineConfig: EngineConfig, lifecycleEventController: EngineLifecycleEventController, logger: Logger);
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    private configureRoutes;
+}

package/dist/modules/engine-v2/engine-control-plane-server.js

@@ -0,0 +1,84 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EngineControlPlaneServer = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
+const express_1 = __importDefault(require("express"));
+const node_http_1 = require("node:http");
+const middlewares_1 = require("../../middlewares");
+const response_helper_1 = require("../../response-helper");
+const engine_control_plane_auth_middleware_1 = require("./engine-control-plane-auth.middleware");
+const engine_v2_constants_1 = require("./engine-v2.constants");
+const engine_lifecycle_event_controller_1 = require("./engine-lifecycle-event.controller");
+let EngineControlPlaneServer = class EngineControlPlaneServer {
+    get port() {
+        return this.server?.address()?.port;
+    }
+    constructor(engineConfig, lifecycleEventController, logger) {
+        this.engineConfig = engineConfig;
+        this.lifecycleEventController = lifecycleEventController;
+        this.logger = logger;
+        this.logger = this.logger.scoped('engine-v2');
+    }
+    async start() {
+        const app = (0, express_1.default)();
+        app.disable('x-powered-by');
+        this.configureRoutes(app);
+        const { controlPlaneHost: host, controlPlanePort: port } = this.engineConfig;
+        this.server = (0, node_http_1.createServer)(app);
+        this.server.on('error', (error) => {
+            if (error.code !== 'EADDRINUSE') {
+                this.logger.error('Engine 2.0 control plane server error', { error });
+                return;
+            }
+            this.logger.error(`Engine 2.0 control plane port ${port} is already in use`);
+            if (!backend_common_1.inTest)
+                process.exit(1);
+        });
+        await new Promise((resolve, reject) => {
+            const onBindError = (error) => reject(error);
+            this.server.once('error', onBindError);
+            this.server.listen(port, host, () => {
+                this.server.off('error', onBindError);
+                resolve();
+            });
+        });
+        const shownHost = host.includes(':') ? `[${host}]` : host;
+        this.logger.info(`Engine 2.0 control plane listening on http://${shownHost}:${this.port}`);
+    }
+    async stop() {
+        if (!this.server)
+            return;
+        await new Promise((resolve, reject) => {
+            this.server.close((error) => (error ? reject(error) : resolve()));
+        });
+        this.server = undefined;
+    }
+    configureRoutes(app) {
+        app.get('/healthz', (_req, res) => {
+            res.status(200).json({ status: 'ok' });
+        });
+        app.use(engine_v2_constants_1.CONTROL_PLANE_PREFIX, (0, engine_control_plane_auth_middleware_1.createEngineControlPlaneAuthMiddleware)(this.engineConfig, this.logger));
+        app.use(engine_v2_constants_1.CONTROL_PLANE_PREFIX, middlewares_1.rawBodyReader, middlewares_1.bodyParser);
+        app.post(engine_v2_constants_1.STATUS_CALLBACK_PATH, (0, response_helper_1.send)(async (req, res) => await this.lifecycleEventController.receiveLifecycleEvents(req, res)));
+    }
+};
+exports.EngineControlPlaneServer = EngineControlPlaneServer;
+exports.EngineControlPlaneServer = EngineControlPlaneServer = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [config_1.EngineConfig, engine_lifecycle_event_controller_1.EngineLifecycleEventController, backend_common_1.Logger])
+], EngineControlPlaneServer);
+//# sourceMappingURL=engine-control-plane-server.js.map

package/dist/modules/engine-v2/engine-control-plane-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"engine-control-plane-server.js","sourceRoot":"","sources":["../../../src/modules/engine-v2/engine-control-plane-server.ts"],"names":[],"mappings":"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"}

package/dist/modules/engine-v2/engine-data-plane-client.d.ts

@@ -1,7 +1,8 @@
 import { OutboundHttp } from '@n8n/backend-network';
 import { EngineConfig } from '@n8n/config';
-import type { StartExecutionRequest, StartExecutionResult } from '@n8n/engine';
+import type { ExecutionSnapshot, StartExecutionRequest, StartExecutionResult } from '@n8n/engine';
 import { InstanceSettings } from 'n8n-core';
+import type { ExecutionIdV2 } from '../../executions/execution-id';
 import type { EngineDataPlaneProvider } from '../../services/engine-data-plane-proxy.service';
 export declare class EngineDataPlaneClient implements EngineDataPlaneProvider {
     private readonly engineConfig;
@@ -10,6 +11,7 @@ export declare class EngineDataPlaneClient implements EngineDataPlaneProvider {
     constructor(engineConfig: EngineConfig, outboundHttp: OutboundHttp, instanceSettings: InstanceSettings);
     private caller;
     startExecution(request: StartExecutionRequest): Promise<StartExecutionResult>;
+    getExecution(id: ExecutionIdV2): Promise<ExecutionSnapshot | undefined>;
     private toError;
     private parseErrorResponse;
 }

package/dist/modules/engine-v2/engine-data-plane-client.js

@@ -22,7 +22,7 @@ let EngineDataPlaneClient = class EngineDataPlaneClient {
         this.engineConfig = engineConfig;
         this.instanceSettings = instanceSettings;
         this.http = outboundHttp.requests({
-            ssrf: 'disabled',
+            useDefaultSsrfPolicy: 'unsafe',
             baseURL: engineConfig.baseUrl || `http://127.0.0.1:${engineConfig.port}`,
             headers: () => ({
                 authorization: `Bearer ${(0, engine_1.mintIdentityToken)(this.engineConfig.authSecret, this.caller())}`,
@@ -47,6 +47,21 @@ let EngineDataPlaneClient = class EngineDataPlaneClient {
             throw this.toError(response.statusCode, response.body);
         return response.body;
     }
+    async getExecution(id) {
+        const response = await this.http.request({
+            url: `/api/workflow-executions/${encodeURIComponent(id)}`,
+            method: 'GET',
+            json: true,
+            returnFullResponse: true,
+            ignoreHttpStatusErrors: true,
+            disableFollowRedirect: true,
+        });
+        if (response.statusCode === 404)
+            return undefined;
+        if (response.statusCode >= 300)
+            throw this.toError(response.statusCode, response.body);
+        return response.body;
+    }
     toError(statusCode, body) {
         const { error, reason } = this.parseErrorResponse(body);
         const detail = reason ?? error;

package/dist/modules/engine-v2/engine-data-plane-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine-data-plane-client.js","sourceRoot":"","sources":["../../../src/modules/engine-v2/engine-data-plane-client.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAsD;AAEtD,0DAAoD;AACpD,wCAA2C;AAC3C,gCAAkC;AAOlC,wCAAgD;AAChD,uCAA4C;AAC5C,+CAA2D;AAapD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGjC,YACkB,YAA0B,EAC3C,YAA0B,EACT,gBAAkC;4BAFlC,YAAY;gCAEZ,gBAAgB;QAEjC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC;YAEjC,IAAI,EAAE,UAAU;YAIhB,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,oBAAoB,YAAY,CAAC,IAAI,EAAE;YAIxE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;gBACf,aAAa,EAAE,UAAU,IAAA,0BAAiB,EAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;aACzF,CAAC;SACF,CAAC,CAAC;IACJ,CAAC;IAMO,MAAM;QACb,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC7C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA8B;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAA6C;YACpF,GAAG,EAAE,0BAA0B;YAC/B,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI;YACV,kBAAkB,EAAE,IAAI;YAGxB,sBAAsB,EAAE,IAAI;YAI5B,qBAAqB,EAAE,IAAI;SAC3B,CAAC,CAAC;QAKH,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG;YAAE,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEvF,OAAO,QAAQ,CAAC,IAA4B,CAAC;IAC9C,CAAC;IAEO,OAAO,CAAC,UAAkB,EAAE,IAAa;QAChD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,KAAK,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3C,QAAQ,UAAU,EAAE,CAAC;YACpB,KAAK,GAAG;gBACP,OAAO,IAAI,wBAAS,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;YAC/D,KAAK,GAAG;gBACP,OAAO,IAAI,+BAAgB,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;YAC5E,KAAK,GAAG;gBACP,OAAO,IAAI,wBAAS,CAAC,4CAA4C,MAAM,EAAE,CAAC,CAAC;YAC5E;gBACC,OAAO,IAAI,+BAAgB,CAAC,yBAAyB,UAAU,GAAG,MAAM,EAAE,CAAC,CAAC;QAC9E,CAAC;IACF,CAAC;IAMO,kBAAkB,CAAC,IAAa;QACvC,IAAI,CAAC,IAAA,gCAAe,EAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QAEtC,OAAO,IAAoC,CAAC;IAC7C,CAAC;CACD,CAAA;;gCAnFY,qBAAqB;IADjC,IAAA,YAAO,GAAE;qCAKuB,qBAAY,EAC7B,8BAAY,EACS,2BAAgB;GANxC,qBAAqB,CAmFjC"}
+{"version":3,"file":"engine-data-plane-client.js","sourceRoot":"","sources":["../../../src/modules/engine-v2/engine-data-plane-client.ts"],"names":[],"mappings":"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"}

package/dist/modules/engine-v2/engine-lifecycle-event-push-relay.d.ts

@@ -0,0 +1,18 @@
+import { Logger } from '@n8n/backend-common';
+import type { LifecycleEvent } from '@n8n/engine';
+import { Push } from '../../push';
+import { EngineV2PushRegistry } from '../../services/engine-v2-push-registry.service';
+export declare class EngineLifecycleEventPushRelay {
+    private readonly registry;
+    private readonly push;
+    private readonly logger;
+    constructor(registry: EngineV2PushRegistry, push: Push, logger: Logger);
+    relay(events: LifecycleEvent[]): void;
+    private relayOne;
+    private onExecutionStarted;
+    private onStepStarted;
+    private onStepSettled;
+    private onExecutionFinished;
+    private sendNodeExecuteBefore;
+    private sendNodeExecuteAfter;
+}