n8n 2.43.4 → 2.44.1

package/dist/modules/promotions.ee/promotion-providers.service.js

@@ -17,18 +17,23 @@ const n8n_workflow_1 = require("n8n-workflow");
 const errors_1 = require("@n8n/errors");
 const promotion_connection_repository_1 = require("./database/repositories/promotion-connection.repository");
 const promotion_provider_repository_1 = require("./database/repositories/promotion-provider.repository");
+const git_host_clients_1 = require("./git-hosts/git-host-clients");
 const promotion_conflicts_1 = require("./promotion-conflicts");
 const promotions_git_service_1 = require("./promotions-git.service");
 const promotions_types_1 = require("./promotions.types");
 let PromotionProvidersService = class PromotionProvidersService {
-    constructor(providerRepository, connectionRepository, gitService, cipher) {
+    constructor(providerRepository, connectionRepository, gitService, cipher, gitHosts) {
         this.providerRepository = providerRepository;
         this.connectionRepository = connectionRepository;
         this.gitService = gitService;
         this.cipher = cipher;
+        this.gitHosts = gitHosts;
     }
     async create(input) {
-        const { config, auth } = await this.buildAuthentication(input.auth);
+        const hostConfig = this.resolveHostConfig(input.type, input.auth.authType, input.config);
+        const { config, credentials } = await this.buildAuthentication(input.type, input.auth, hostConfig);
+        await this.validateHostAccess(input.type, config, credentials);
+        const auth = await this.encryptCredentials(credentials);
         const provider = await this.providerRepository.insertProvider({
             name: input.name,
             type: input.type,
@@ -50,21 +55,22 @@ let PromotionProvidersService = class PromotionProvidersService {
             throw new errors_1.BadRequestError('At least one field is required');
         }
         const current = await this.getEntity(id);
-        const changes = {};
-        if (input.name !== undefined)
-            changes.name = input.name;
-        if (input.auth) {
-            if (input.auth.authType !== current.authType) {
-                throw new errors_1.BadRequestError('A provider cannot change its authentication method. Create another provider instead.');
+        const { changes, config, credentials } = await this.prepareUpdate(current, input);
+        const updatesAuthentication = input.auth !== undefined || input.config !== undefined;
+        if (updatesAuthentication) {
+            await this.validateHostAccess(current.type, config, credentials ?? (await this.decryptCredentials(current)));
+        }
+        if (credentials)
+            changes.auth = await this.encryptCredentials(credentials);
+        if (updatesAuthentication) {
+            const updated = await this.providerRepository.updateProviderIfUnchanged(id, { config: current.config, auth: current.auth }, changes);
+            if (!updated) {
+                throw new errors_1.ConflictError('The provider changed during the update. Reload it and try again.');
             }
-            const requested = input.auth.authType === 'ssh-key'
-                ? { ...input.auth, keyType: input.auth.keyType ?? this.storedKeyType(current) }
-                : input.auth;
-            const { config, auth } = await this.buildAuthentication(requested);
-            changes.config = config;
-            changes.auth = auth;
-        }
-        await this.providerRepository.updateProvider(id, changes);
+        }
+        else {
+            await this.providerRepository.updateProvider(id, changes);
+        }
         return this.toPublic(await this.getEntity(id));
     }
     async delete(id) {
@@ -80,6 +86,53 @@ let PromotionProvidersService = class PromotionProvidersService {
             throw new errors_1.NotFoundError('Promotion provider not found');
         return provider;
     }
+    async prepareUpdate(current, input) {
+        const changes = {};
+        if (input.name !== undefined)
+            changes.name = input.name;
+        if (input.config !== undefined) {
+            changes.config = this.resolveHostConfig(current.type, current.authType, input.config);
+            if (!input.auth && !this.isSameHostUrl(current.config, input.config)) {
+                throw new errors_1.BadRequestError('Changing the Git host URL requires token authentication. Send auth and config in the same request.');
+            }
+        }
+        const config = changes.config ?? current.config;
+        if (!input.auth)
+            return { changes, config, credentials: undefined };
+        if (input.auth.authType !== current.authType) {
+            throw new errors_1.BadRequestError('A provider cannot change its authentication method. Create another provider instead.');
+        }
+        const requested = input.auth.authType === 'ssh-key'
+            ? { ...input.auth, keyType: input.auth.keyType ?? this.storedKeyType(current) }
+            : input.auth;
+        const isGitHost = (0, api_types_1.isPromotionGitHostType)(current.type);
+        const authentication = await this.buildAuthentication(current.type, requested, isGitHost ? config : undefined);
+        if (!isGitHost)
+            changes.config = authentication.config;
+        return { changes, ...authentication };
+    }
+    isSameHostUrl(current, next) {
+        const parsed = api_types_1.promotionGitHostConfigSchema.safeParse(current);
+        if (!parsed.success)
+            return false;
+        const currentUrl = new URL(parsed.data.baseUrl).href.replace(/\/$/, '');
+        const nextUrl = new URL(next.baseUrl).href.replace(/\/$/, '');
+        return currentUrl === nextUrl;
+    }
+    async validateHostAccess(type, publicConfig, credentials) {
+        if (!(0, api_types_1.isPromotionGitHostType)(type))
+            return;
+        const config = api_types_1.promotionGitHostConfigSchema.safeParse(publicConfig);
+        if (!config.success) {
+            throw new errors_1.BadRequestError('The stored provider config cannot be read. Update the provider to replace it.');
+        }
+        if (credentials.authType !== 'token')
+            throw unreadableCredentialsError();
+        await this.gitHosts.clientFor(type).validateAccess({
+            baseUrl: config.data.baseUrl,
+            accessToken: credentials.password,
+        });
+    }
     async decryptCredentials(source) {
         let stored;
         try {
@@ -118,26 +171,44 @@ let PromotionProvidersService = class PromotionProvidersService {
         const { config: _, ...summary } = this.toPublic(provider);
         return summary;
     }
-    async buildAuthentication(auth) {
+    resolveHostConfig(type, authType, config) {
+        if (!(0, api_types_1.supportsPromotionAuthType)(type, authType)) {
+            throw new errors_1.BadRequestError(`A ${type} provider does not support ${authType} authentication`);
+        }
+        if ((0, api_types_1.isPromotionGitHostType)(type)) {
+            if (!config)
+                throw new errors_1.BadRequestError(`A ${type} provider requires a config with a base URL`);
+            return config;
+        }
+        if (config)
+            throw new errors_1.BadRequestError('A git provider does not take a config');
+        return undefined;
+    }
+    async buildAuthentication(type, auth, hostConfig) {
         if (auth.authType === 'ssh-key') {
             const keyPair = await this.gitService.generateSshKeyPair(auth.keyType);
             return {
-                config: { schemaVersion: 1, publicKey: keyPair.publicKey, keyType: auth.keyType },
-                auth: await this.encryptPayload({ schemaVersion: 1, privateKey: keyPair.privateKey }),
+                config: hostConfig ?? {
+                    schemaVersion: 1,
+                    publicKey: keyPair.publicKey,
+                    keyType: auth.keyType,
+                },
+                credentials: { authType: 'ssh-key', privateKey: keyPair.privateKey },
             };
         }
-        this.assertUsableCredentials(auth.username, auth.password);
+        const username = api_types_1.promotionProviderTypeCapabilities[type].tokenUsername ?? auth.username;
+        if (username === undefined) {
+            throw new errors_1.BadRequestError('This provider requires a username for token authentication. Send username and password together.');
+        }
+        this.assertUsableCredentials(username, auth.password);
         return {
-            config: { schemaVersion: 1 },
-            auth: await this.encryptPayload({
-                schemaVersion: 1,
-                username: auth.username,
-                password: auth.password,
-            }),
+            config: hostConfig ?? { schemaVersion: 1 },
+            credentials: { authType: 'token', username, password: auth.password },
         };
     }
-    async encryptPayload(payload) {
-        return await this.cipher.encryptV2(JSON.stringify(payload));
+    async encryptCredentials(credentials) {
+        const { authType: _, ...payload } = credentials;
+        return await this.cipher.encryptV2(JSON.stringify({ schemaVersion: 1, ...payload }));
     }
     assertUsableCredentials(username, password) {
         if ([username, password].some((value) => /[\r\n\0]/.test(value))) {
@@ -156,7 +227,7 @@ let PromotionProvidersService = class PromotionProvidersService {
 exports.PromotionProvidersService = PromotionProvidersService;
 exports.PromotionProvidersService = PromotionProvidersService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [promotion_provider_repository_1.PromotionProviderRepository, promotion_connection_repository_1.PromotionConnectionRepository, promotions_git_service_1.PromotionsGitService, n8n_core_1.Cipher])
+    __metadata("design:paramtypes", [promotion_provider_repository_1.PromotionProviderRepository, promotion_connection_repository_1.PromotionConnectionRepository, promotions_git_service_1.PromotionsGitService, n8n_core_1.Cipher, git_host_clients_1.GitHostClients])
 ], PromotionProvidersService);
 function unreadableCredentialsError() {
     return new errors_1.BadRequestError('The stored provider credentials cannot be read. Update the provider to replace them.');

package/dist/modules/promotions.ee/promotion-providers.service.js.map

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

package/dist/modules/promotions.ee/promotions.service.js

@@ -48,7 +48,7 @@ const IMPORT_POLICY = {
     overwriteDeletionPolicy: n8n_packages_types_1.OverwriteDeletionPolicy.HardDelete,
     dataTableMatchingMode: 'by-id',
     dataTableMissingMode: n8n_packages_types_1.DataTableMissingMode.Create,
-    dataTableSchemaConflictPolicy: n8n_packages_types_1.DataTableSchemaConflictPolicy.Fail,
+    dataTableSchemaConflictPolicy: n8n_packages_types_1.DataTableSchemaConflictPolicy.OverwriteNonDestructive,
     variableMissingMode: n8n_packages_types_1.VariableMissingMode.MustPreexist,
     variableConflictPolicy: n8n_packages_types_1.VariableConflictPolicy.KeepExisting,
     tagMissingMode: n8n_packages_types_1.TagMissingMode.Create,
@@ -117,12 +117,13 @@ let PromotionsService = class PromotionsService {
             const exportResult = await this.n8nPackagesService.exportPackageToDirectory({
                 user: actor,
                 projectIds,
+                includeAgents: false,
                 includeVariableValues: true,
                 canExportVariableValues: request.canExportVariableValues,
                 includeTags: true,
                 includeArchivedWorkflows: true,
-                missingWorkflowDependencyPolicy: n8n_packages_types_1.MissingWorkflowDependencyPolicy.Fail,
-                workflowVersionPolicy: n8n_packages_types_1.WorkflowVersionPolicy.Latest,
+                dependencyPolicy: n8n_packages_types_1.ExportDependencyPolicy.Fail,
+                versionPolicy: n8n_packages_types_1.ExportVersionPolicy.Latest,
             }, { targetDir: stagingFolder });
             await (0, promises_1.rm)(packageFolder, { recursive: true, force: true });
             await (0, promises_1.rename)(stagingFolder, packageFolder);
@@ -183,8 +184,8 @@ let PromotionsService = class PromotionsService {
                 canExportVariableValues: request.canExportVariableValues,
                 includeTags: true,
                 includeArchivedWorkflows: true,
-                missingWorkflowDependencyPolicy: n8n_packages_types_1.MissingWorkflowDependencyPolicy.ReferenceOnly,
-                workflowVersionPolicy: n8n_packages_types_1.WorkflowVersionPolicy.Latest,
+                dependencyPolicy: n8n_packages_types_1.ExportDependencyPolicy.ReferenceOnly,
+                versionPolicy: n8n_packages_types_1.ExportVersionPolicy.Latest,
             }, { targetDir: stagingFolder });
             await this.workingCopy.applySelection(packageFolder, stagingFolder, staging, selection, branch);
             if (targetBranchName) {
@@ -268,13 +269,13 @@ let PromotionsService = class PromotionsService {
         return await this.applyFromSource(connectionId, actor, expectedSource);
     }
     async continueApply(connectionId, actor, request) {
-        return await this.applyFromSource(connectionId, actor, request.expectedSource);
+        return await this.applyFromSource(connectionId, actor, request.expectedSource, request.confirmDestructiveChanges === true);
     }
     async applyProjectSelection(projectId, actor, request) {
         return await this.applySelectionFromSource(projectId, actor, request.workflowIds, request.expectedSource);
     }
     async continueApplyProjectSelection(projectId, actor, request) {
-        return await this.applySelectionFromSource(projectId, actor, request.workflowIds, request.expectedSource);
+        return await this.applySelectionFromSource(projectId, actor, request.workflowIds, request.expectedSource, request.confirmDestructiveChanges === true);
     }
     async classifyApplySelection(inventory, projectId, workflowIds) {
         const branchWorkflowIds = new Set(inventory.workflows
@@ -310,7 +311,7 @@ let PromotionsService = class PromotionsService {
         }
         return { selectedProjectId: projectId, selectedWorkflowIds, deletedWorkflowIds };
     }
-    async applySelectionFromSource(projectId, actor, workflowIds, expectedSource) {
+    async applySelectionFromSource(projectId, actor, workflowIds, expectedSource, confirmDestructiveChanges = false) {
         const input = await this.resolver.resolveForProject(projectId, 'apply');
         await this.assertCheckoutReady(input, 'applying');
         const branchName = (0, promotions_git_utils_1.checkoutBranchName)(input.config);
@@ -351,9 +352,12 @@ let PromotionsService = class PromotionsService {
                 selectedWorkflowIds: selection.selectedWorkflowIds,
             },
         });
+        const blockingConflicts = confirmDestructiveChanges
+            ? preflight.conflicts.filter(({ code }) => code !== 'destructive-change')
+            : preflight.conflicts;
         if (preflight.missingBindings.length > 0 ||
             preflight.accessRequirements.length > 0 ||
-            preflight.conflicts.length > 0) {
+            blockingConflicts.length > 0) {
             this.logger.info('Apply blocked by unresolved bindings', {
                 status: 'blocked',
                 ...identity,
@@ -371,8 +375,15 @@ let PromotionsService = class PromotionsService {
             projectId,
             selectedCount: selection.selectedWorkflowIds.length,
             deletedCount: selection.deletedWorkflowIds?.length ?? 0,
+            confirmDestructiveChanges,
         });
-        const result = await this.n8nPackagesService.importPackageSelectionFromDirectory({ user: actor, overwriteDeletionPolicy: n8n_packages_types_1.OverwriteDeletionPolicy.HardDelete }, { sourceDir: packageFolder }, selection);
+        const result = await this.n8nPackagesService.importPackageSelectionFromDirectory({
+            user: actor,
+            overwriteDeletionPolicy: n8n_packages_types_1.OverwriteDeletionPolicy.HardDelete,
+            dataTableSchemaConflictPolicy: confirmDestructiveChanges
+                ? n8n_packages_types_1.DataTableSchemaConflictPolicy.Overwrite
+                : IMPORT_POLICY.dataTableSchemaConflictPolicy,
+        }, { sourceDir: packageFolder }, selection);
         return {
             status: 'applied',
             ...identity,
@@ -383,7 +394,7 @@ let PromotionsService = class PromotionsService {
             warnings: preflight.warnings,
         };
     }
-    async applyFromSource(connectionId, actor, expectedSource) {
+    async applyFromSource(connectionId, actor, expectedSource, confirmDestructiveChanges = false) {
         const input = await this.resolver.resolveForConnection(connectionId, 'apply');
         this.assertInstanceScope(input, 'Apply');
         await this.assertCheckoutReady(input, 'applying');
@@ -418,9 +429,12 @@ let PromotionsService = class PromotionsService {
         const preflight = await this.bindingPreflight.checkDirectory({
             sourceDir: packageFolder,
         });
+        const blockingConflicts = confirmDestructiveChanges
+            ? preflight.conflicts.filter(({ code }) => code !== 'destructive-change')
+            : preflight.conflicts;
         if (preflight.missingBindings.length > 0 ||
             preflight.accessRequirements.length > 0 ||
-            preflight.conflicts.length > 0) {
+            blockingConflicts.length > 0) {
             this.logger.info('Apply blocked by unresolved bindings', {
                 status: 'blocked',
                 ...identity,
@@ -433,8 +447,18 @@ let PromotionsService = class PromotionsService {
             });
             return { status: 'blocked', ...identity, preflight };
         }
-        this.logger.info('Importing a package', { connectionId, configId: input.configId });
-        const result = await this.n8nPackagesService.importPackageFromDirectory({ user: actor, ...IMPORT_POLICY }, { sourceDir: packageFolder });
+        this.logger.info('Importing a package', {
+            connectionId,
+            configId: input.configId,
+            confirmDestructiveChanges,
+        });
+        const result = await this.n8nPackagesService.importPackageFromDirectory({
+            user: actor,
+            ...IMPORT_POLICY,
+            dataTableSchemaConflictPolicy: confirmDestructiveChanges
+                ? n8n_packages_types_1.DataTableSchemaConflictPolicy.Overwrite
+                : IMPORT_POLICY.dataTableSchemaConflictPolicy,
+        }, { sourceDir: packageFolder });
         const importedProjectIds = result.projects.map((project) => project.localId);
         const projectReconciliation = await this.reconcileTeamProjects(actor, importedProjectIds);
         return {
@@ -458,6 +482,8 @@ let PromotionsService = class PromotionsService {
             pathspecs: base_branch_files_1.BASE_BRANCH_DIRECTORIES.map((directory) => `${constants_2.PACKAGE_SUBFOLDER}/${directory}/`),
         });
         return {
+            configId: input.configId,
+            branchName,
             commitSha,
             files: (0, base_branch_files_1.parseBaseBranchFiles)(lsTreeOutput, { exportRoot: constants_2.PACKAGE_SUBFOLDER, projectId }),
             readFiles: async (filePaths) => {
@@ -583,6 +609,7 @@ let PromotionsService = class PromotionsService {
             dataTables: {
                 matched: importResult.dataTables.matched,
                 created: importResult.dataTables.created,
+                updated: importResult.dataTables.updated,
             },
             variables: {
                 matched: importResult.variables.matched.length,

package/dist/modules/promotions.ee/promotions.service.js.map

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

package/dist/modules/promotions.ee/promotions.types.d.ts

@@ -54,6 +54,8 @@ export type PromotionOperationInput = Readonly<{
     config: ResolvedPromotionConfig;
 }>;
 export type BranchPackage = Readonly<{
+    configId: string;
+    branchName: string;
     commitSha: string | null;
     files: PackageFile[];
     readFiles: (paths: readonly string[]) => Promise<Map<string, string>>;

package/dist/modules/promotions.ee/working-copy-updater.d.ts

@@ -42,11 +42,13 @@ export declare class WorkingCopyUpdater {
     assertSelectionFitsBranch(exportFolder: string, selection: SelectivePushOptions): Promise<ScannedBranch>;
     assertDeletionsOnBranch(branch: BranchLayout, selection: SelectivePushOptions): void;
     assertNoCrossProjectMoves(branch: BranchLayout, selection: SelectivePushOptions): void;
+    private assertNoCrossProjectContainerMoves;
     applySelection(exportFolder: string, stagingFolder: string, staging: PackageManifest, selection: SelectivePushOptions, branch: ScannedBranch): Promise<void>;
     private assertRemovableLeafTarget;
     private partitionChangedDependencies;
     private readEntityId;
-    private resolveDependencyDir;
+    private resolveLeafTarget;
+    private relocateBranchContainers;
     private overlayDirectory;
     private resolveContained;
 }