n8n 1.113.3 → 1.114.0

package/dist/controllers/project.controller.d.ts

@@ -1,4 +1,4 @@
-import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
+import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto, AddUsersToProjectDto, ChangeUserRoleInProject } from '@n8n/api-types';
 import type { Project } from '@n8n/db';
 import { AuthenticatedRequest, ProjectRepository } from '@n8n/db';
 import type { Scope } from '@n8n/permissions';
@@ -54,6 +54,9 @@ export declare class ProjectController {
         setUpdateDate(): void;
     }>;
     getProject(req: AuthenticatedRequest, _res: Response, projectId: string): Promise<ProjectRequest.ProjectWithRelations>;
-    updateProject(req: AuthenticatedRequest, _res: Response, payload: UpdateProjectDto, projectId: string): Promise<void>;
+    updateProject(_req: AuthenticatedRequest, _res: Response, payload: UpdateProjectDto, projectId: string): Promise<void>;
+    addProjectUsers(req: AuthenticatedRequest, res: Response, projectId: string, payload: AddUsersToProjectDto): Promise<Response<any, Record<string, any>>>;
+    changeProjectUserRole(req: AuthenticatedRequest, res: Response, projectId: string, userId: string, body: ChangeUserRoleInProject): Promise<Response<any, Record<string, any>>>;
+    deleteProjectUser(req: AuthenticatedRequest, res: Response, projectId: string, userId: string): Promise<Response<any, Record<string, any>>>;
     deleteProject(req: AuthenticatedRequest, _res: Response, query: DeleteProjectDto, projectId: string): Promise<void>;
 }

package/dist/controllers/project.controller.js

@@ -143,34 +143,72 @@ let ProjectController = class ProjectController {
             ],
         };
     }
-    async updateProject(req, _res, payload, projectId) {
-        const { name, icon, relations, description } = payload;
-        if (name || icon || description) {
-            await this.projectsService.updateProject(projectId, { name, icon, description });
-        }
-        if (relations) {
-            try {
-                const { project, newRelations } = await this.projectsService.syncProjectRelations(projectId, relations);
+    async updateProject(_req, _res, payload, projectId) {
+        await this.projectsService.updateProject(projectId, payload);
+    }
+    async addProjectUsers(req, res, projectId, payload) {
+        try {
+            const { added, conflicts, project } = await this.projectsService.addUsersWithConflictSemantics(projectId, payload.relations);
+            if (added.length > 0) {
                 await this.userManagementMailer.notifyProjectShared({
                     sharer: req.user,
-                    newSharees: newRelations,
+                    newSharees: added,
                     project: { id: project.id, name: project.name },
                 });
             }
-            catch (e) {
-                if (e instanceof project_service_ee_1.UnlicensedProjectRoleError) {
-                    throw new bad_request_error_1.BadRequestError(e.message);
-                }
-                throw e;
+            const relations = await this.projectsService.getProjectRelations(projectId);
+            this.eventService.emit('team-project-updated', {
+                userId: req.user.id,
+                role: req.user.role.slug,
+                members: relations.map((r) => ({ userId: r.userId, role: r.role.slug })),
+                projectId,
+            });
+            if (added.length > 0) {
+                return conflicts.length > 0 ? res.status(201).json({ conflicts }) : res.status(201).send();
             }
+            if (conflicts.length > 0)
+                return res.status(409).json({ conflicts });
+            return res.status(200).send();
+        }
+        catch (e) {
+            if (e instanceof project_service_ee_1.UnlicensedProjectRoleError) {
+                throw new bad_request_error_1.BadRequestError(e.message);
+            }
+            throw e;
+        }
+    }
+    async changeProjectUserRole(req, res, projectId, userId, body) {
+        try {
+            await this.projectsService.changeUserRoleInProject(projectId, userId, body.role);
+            await this.projectsService.clearCredentialCanUseExternalSecretsCache(projectId);
+            const relations = await this.projectsService.getProjectRelations(projectId);
             this.eventService.emit('team-project-updated', {
                 userId: req.user.id,
                 role: req.user.role.slug,
-                members: relations,
+                members: relations.map((r) => ({ userId: r.userId, role: r.role.slug })),
                 projectId,
             });
+            return res.status(204).send();
+        }
+        catch (e) {
+            if (e instanceof project_service_ee_1.UnlicensedProjectRoleError) {
+                throw new bad_request_error_1.BadRequestError(e.message);
+            }
+            throw e;
         }
     }
+    async deleteProjectUser(req, res, projectId, userId) {
+        await this.projectsService.deleteUserFromProject(projectId, userId);
+        await this.projectsService.clearCredentialCanUseExternalSecretsCache(projectId);
+        const relations = await this.projectsService.getProjectRelations(projectId);
+        this.eventService.emit('team-project-updated', {
+            userId: req.user.id,
+            role: req.user.role.slug,
+            members: relations.map((r) => ({ userId: r.userId, role: r.role.slug })),
+            projectId,
+        });
+        return res.status(204).send();
+    }
     async deleteProject(req, _res, query, projectId) {
         await this.projectsService.deleteProject(req.user, projectId, {
             migrateToProject: query.transferId,
@@ -235,6 +273,34 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, api_types_1.UpdateProjectDto, String]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "updateProject", null);
+__decorate([
+    (0, decorators_1.Post)('/:projectId/users'),
+    (0, decorators_1.ProjectScope)('project:update'),
+    __param(2, (0, decorators_1.Param)('projectId')),
+    __param(3, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String, api_types_1.AddUsersToProjectDto]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "addProjectUsers", null);
+__decorate([
+    (0, decorators_1.Patch)('/:projectId/users/:userId'),
+    (0, decorators_1.ProjectScope)('project:update'),
+    __param(2, (0, decorators_1.Param)('projectId')),
+    __param(3, (0, decorators_1.Param)('userId')),
+    __param(4, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String, String, api_types_1.ChangeUserRoleInProject]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "changeProjectUserRole", null);
+__decorate([
+    (0, decorators_1.Delete)('/:projectId/users/:userId'),
+    (0, decorators_1.ProjectScope)('project:update'),
+    __param(2, (0, decorators_1.Param)('projectId')),
+    __param(3, (0, decorators_1.Param)('userId')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String, String]),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "deleteProjectUser", null);
 __decorate([
     (0, decorators_1.Delete)('/:projectId'),
     (0, decorators_1.ProjectScope)('project:delete'),

package/dist/controllers/project.controller.js.map

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

package/dist/credentials-overwrites.d.ts

@@ -1,15 +1,30 @@
 import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
+import { SettingsRepository } from '@n8n/db';
+import { Request, Response, NextFunction } from 'express';
+import { Cipher } from 'n8n-core';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { CredentialTypes } from './credential-types';
 import type { ICredentialsOverwrite } from './interfaces';
 export declare class CredentialsOverwrites {
+    private readonly globalConfig;
     private readonly credentialTypes;
     private readonly logger;
+    private readonly settings;
+    private readonly cipher;
     private overwriteData;
     private resolvedTypes;
-    constructor(globalConfig: GlobalConfig, credentialTypes: CredentialTypes, logger: Logger);
-    setData(overwriteData: ICredentialsOverwrite): void;
+    constructor(globalConfig: GlobalConfig, credentialTypes: CredentialTypes, logger: Logger, settings: SettingsRepository, cipher: Cipher);
+    init(): Promise<void>;
+    private reloading;
+    reloadOverwriteCredentials(): Promise<void>;
+    loadOverwriteDataFromDB(reloadFrontend: boolean): Promise<void>;
+    private broadcastReloadOverwriteCredentialsCommand;
+    saveOverwriteDataToDB(overwriteData: ICredentialsOverwrite, broadcast?: boolean): Promise<void>;
+    getOverwriteEndpointMiddleware(): ((req: Request, res: Response, next: NextFunction) => void) | null;
+    setPlainData(overwriteData: ICredentialsOverwrite): void;
+    setData(overwriteData: ICredentialsOverwrite, storeInDb?: boolean, reloadFrontend?: boolean): Promise<void>;
+    private reloadFrontendService;
     applyOverwrite(type: string, data: ICredentialDataDecryptedObject): ICredentialDataDecryptedObject;
     getOverwrites(type: string): ICredentialDataDecryptedObject | undefined;
     private get;

package/dist/credentials-overwrites.js

@@ -1,10 +1,43 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -12,22 +45,95 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialsOverwrites = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
+const db_1 = require("@n8n/db");
+const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const credential_types_1 = require("./credential-types");
+const CREDENTIALS_OVERWRITE_KEY = 'credentialsOverwrite';
 let CredentialsOverwrites = class CredentialsOverwrites {
-    constructor(globalConfig, credentialTypes, logger) {
+    constructor(globalConfig, credentialTypes, logger, settings, cipher) {
+        this.globalConfig = globalConfig;
         this.credentialTypes = credentialTypes;
         this.logger = logger;
+        this.settings = settings;
+        this.cipher = cipher;
         this.overwriteData = {};
         this.resolvedTypes = [];
-        const data = globalConfig.credentials.overwrite.data;
-        const overwriteData = (0, n8n_workflow_1.jsonParse)(data, {
-            errorMessage: 'The credentials-overwrite is not valid JSON.',
+        this.reloading = false;
+    }
+    async init() {
+        const data = this.globalConfig.credentials.overwrite.data;
+        if (data) {
+            this.logger.debug('Loading overwrite credentials from static envvar');
+            const overwriteData = (0, n8n_workflow_1.jsonParse)(data, {
+                errorMessage: 'The credentials-overwrite is not valid JSON.',
+            });
+            this.setPlainData(overwriteData);
+        }
+        const persistence = this.globalConfig.credentials.overwrite.persistence;
+        if (persistence) {
+            this.logger.debug('Loading overwrite credentials from database');
+            await this.loadOverwriteDataFromDB(false);
+        }
+    }
+    async reloadOverwriteCredentials() {
+        await this.loadOverwriteDataFromDB(true);
+    }
+    async loadOverwriteDataFromDB(reloadFrontend) {
+        if (this.reloading)
+            return;
+        try {
+            this.reloading = true;
+            this.logger.debug('Loading overwrite credentials from DB');
+            const data = await this.settings.findByKey(CREDENTIALS_OVERWRITE_KEY);
+            if (data) {
+                const decryptedData = this.cipher.decrypt(data.value);
+                const overwriteData = (0, n8n_workflow_1.jsonParse)(decryptedData, {
+                    errorMessage: 'The credentials-overwrite is not valid JSON.',
+                });
+                await this.setData(overwriteData, false, reloadFrontend);
+            }
+        }
+        catch (error) {
+            this.logger.error('Error loading overwrite credentials', { error });
+        }
+        finally {
+            this.reloading = false;
+        }
+    }
+    async broadcastReloadOverwriteCredentialsCommand() {
+        const { Publisher } = await Promise.resolve().then(() => __importStar(require('./scaling/pubsub/publisher.service')));
+        await di_1.Container.get(Publisher).publishCommand({ command: 'reload-overwrite-credentials' });
+    }
+    async saveOverwriteDataToDB(overwriteData, broadcast = true) {
+        const data = this.cipher.encrypt(JSON.stringify(overwriteData));
+        const setting = this.settings.create({
+            key: CREDENTIALS_OVERWRITE_KEY,
+            value: data,
+            loadOnStartup: false,
         });
-        this.setData(overwriteData);
+        await this.settings.save(setting);
+        if (broadcast) {
+            await this.broadcastReloadOverwriteCredentialsCommand();
+        }
+    }
+    getOverwriteEndpointMiddleware() {
+        const { endpointAuthToken } = this.globalConfig.credentials.overwrite;
+        if (!endpointAuthToken?.trim()) {
+            return null;
+        }
+        const expectedAuthorizationHeaderValue = `Bearer ${endpointAuthToken.trim()}`;
+        return (req, res, next) => {
+            if (req.headers.authorization !== expectedAuthorizationHeaderValue) {
+                res.status(401).send('Unauthorized');
+                return;
+            }
+            next();
+        };
     }
-    setData(overwriteData) {
+    setPlainData(overwriteData) {
         this.resolvedTypes.length = 0;
         this.overwriteData = overwriteData;
         for (const type in overwriteData) {
@@ -37,6 +143,19 @@ let CredentialsOverwrites = class CredentialsOverwrites {
             }
         }
     }
+    async setData(overwriteData, storeInDb = true, reloadFrontend = true) {
+        this.setPlainData(overwriteData);
+        if (storeInDb && this.globalConfig.credentials.overwrite.persistence) {
+            await this.saveOverwriteDataToDB(overwriteData, true);
+        }
+        if (reloadFrontend) {
+            await this.reloadFrontendService();
+        }
+    }
+    async reloadFrontendService() {
+        const { FrontendService } = await Promise.resolve().then(() => __importStar(require('./services/frontend.service')));
+        await di_1.Container.get(FrontendService)?.generateTypes();
+    }
     applyOverwrite(type, data) {
         const overwrites = this.get(type);
         if (overwrites === undefined) {
@@ -86,10 +205,18 @@ let CredentialsOverwrites = class CredentialsOverwrites {
     }
 };
 exports.CredentialsOverwrites = CredentialsOverwrites;
+__decorate([
+    (0, decorators_1.OnPubSubEvent)('reload-overwrite-credentials'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], CredentialsOverwrites.prototype, "reloadOverwriteCredentials", null);
 exports.CredentialsOverwrites = CredentialsOverwrites = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [config_1.GlobalConfig,
         credential_types_1.CredentialTypes,
-        backend_common_1.Logger])
+        backend_common_1.Logger,
+        db_1.SettingsRepository,
+        n8n_core_1.Cipher])
 ], CredentialsOverwrites);
 //# sourceMappingURL=credentials-overwrites.js.map

package/dist/credentials-overwrites.js.map

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

package/dist/deprecation/deprecation.service.js

@@ -63,15 +63,6 @@ let DeprecationService = class DeprecationService {
                 matchConfig: config_2.default.getEnv('executions.mode') === 'queue',
                 disableIf: () => this.instanceSettings.instanceType !== 'main',
             },
-            {
-                envVar: 'N8N_PARTIAL_EXECUTION_VERSION_DEFAULT',
-                checkValue: (value) => value === '1',
-                message: 'Version 1 of partial executions is deprecated and will be removed as early as v1.85.0',
-            },
-            {
-                envVar: 'N8N_PARTIAL_EXECUTION_VERSION_DEFAULT',
-                message: 'This environment variable is internal and should not be set.',
-            },
             {
                 envVar: 'N8N_EXPRESSION_EVALUATOR',
                 message: `n8n has replaced \`tmpl\` with \`tournament\` as expression evaluator. ${SAFE_TO_REMOVE}`,
@@ -99,6 +90,8 @@ let DeprecationService = class DeprecationService {
                 envVar: 'N8N_GIT_NODE_DISABLE_BARE_REPOS',
                 message: 'Support for bare repositories in the Git Node will be removed in a future version due to security concerns. If you are not using bare repositories in the Git Node, please set N8N_GIT_NODE_DISABLE_BARE_REPOS=true. Learn more: https://docs.n8n.io/hosting/configuration/environment-variables/security/',
                 checkValue: (value) => value === undefined || value === '',
+                disableIf: () => this.globalConfig.nodes.exclude.includes('n8n-nodes-base.git') ||
+                    this.globalConfig.deployment.type === 'cloud',
             },
         ];
         this.state = new Map();

package/dist/deprecation/deprecation.service.js.map

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

package/dist/environments.ee/source-control/source-control-git.service.ee.d.ts

@@ -18,11 +18,11 @@ export declare class SourceControlGitService {
         sshFolder: string;
         sshKeyName: string;
     }): Promise<void>;
-    setGitSshCommand(gitFolder?: string, sshFolder?: string): Promise<void>;
+    setGitCommand(gitFolder?: string, sshFolder?: string): Promise<void>;
     resetService(): void;
     private checkRepositorySetup;
     private hasRemote;
-    initRepository(sourceControlPreferences: Pick<SourceControlPreferences, 'repositoryUrl' | 'branchName' | 'initRepo'>, user: User): Promise<void>;
+    initRepository(sourceControlPreferences: Pick<SourceControlPreferences, 'repositoryUrl' | 'branchName' | 'initRepo' | 'connectionType'>, user: User): Promise<void>;
     private trackRemoteIfReady;
     setGitUserDetails(name: string, email: string): Promise<void>;
     getBranches(): Promise<{

package/dist/environments.ee/source-control/source-control-git.service.ee.js

@@ -96,7 +96,7 @@ let SourceControlGitService = class SourceControlGitService {
         this.preInitCheck();
         this.logger.debug('Git pre-check passed');
         (0, source_control_helper_ee_1.sourceControlFoldersExistCheck)([gitFolder, sshFolder]);
-        await this.setGitSshCommand(gitFolder, sshFolder);
+        await this.setGitCommand(gitFolder, sshFolder);
         if (!(await this.checkRepositorySetup())) {
             await this.git.init();
         }
@@ -107,14 +107,8 @@ let SourceControlGitService = class SourceControlGitService {
             }
         }
     }
-    async setGitSshCommand(gitFolder = this.sourceControlPreferencesService.gitFolder, sshFolder = this.sourceControlPreferencesService.sshFolder) {
-        const privateKeyPath = await this.sourceControlPreferencesService.getPrivateKeyPath();
-        const sshKnownHosts = path_1.default.join(sshFolder, 'known_hosts');
-        const normalizedPrivateKeyPath = privateKeyPath.split(/[/\\]/).join('/');
-        const normalizedKnownHostsPath = sshKnownHosts.split(/[/\\]/).join('/');
-        const escapedPrivateKeyPath = normalizedPrivateKeyPath.replace(/"/g, '\\"');
-        const escapedKnownHostsPath = normalizedKnownHostsPath.replace(/"/g, '\\"');
-        const sshCommand = `ssh -o UserKnownHostsFile="${escapedKnownHostsPath}" -o StrictHostKeyChecking=no -i "${escapedPrivateKeyPath}"`;
+    async setGitCommand(gitFolder = this.sourceControlPreferencesService.gitFolder, sshFolder = this.sourceControlPreferencesService.sshFolder) {
+        const preferences = this.sourceControlPreferencesService.getPreferences();
         this.gitOptions = {
             baseDir: gitFolder,
             binary: 'git',
@@ -122,9 +116,30 @@ let SourceControlGitService = class SourceControlGitService {
             trimmed: false,
         };
         const { simpleGit } = await Promise.resolve().then(() => __importStar(require('simple-git')));
-        this.git = simpleGit(this.gitOptions)
-            .env('GIT_SSH_COMMAND', sshCommand)
-            .env('GIT_TERMINAL_PROMPT', '0');
+        if (preferences.connectionType === 'https') {
+            const credentials = await this.sourceControlPreferencesService.getDecryptedHttpsCredentials();
+            const credentialScript = `!f() { echo "username=${credentials.username}"; echo "password=${credentials.password}"; }; f`;
+            const httpsGitOptions = {
+                ...this.gitOptions,
+                config: [
+                    'credential.helper=' + credentialScript,
+                    'credential.useHttpPath=true',
+                ],
+            };
+            this.git = simpleGit(httpsGitOptions).env('GIT_TERMINAL_PROMPT', '0');
+        }
+        else if (preferences.connectionType === 'ssh') {
+            const privateKeyPath = await this.sourceControlPreferencesService.getPrivateKeyPath();
+            const sshKnownHosts = path_1.default.join(sshFolder, 'known_hosts');
+            const normalizedPrivateKeyPath = privateKeyPath.split(/[/\\]/).join('/');
+            const normalizedKnownHostsPath = sshKnownHosts.split(/[/\\]/).join('/');
+            const escapedPrivateKeyPath = normalizedPrivateKeyPath.replace(/"/g, '\\"');
+            const escapedKnownHostsPath = normalizedKnownHostsPath.replace(/"/g, '\\"');
+            const sshCommand = `ssh -o UserKnownHostsFile="${escapedKnownHostsPath}" -o StrictHostKeyChecking=no -i "${escapedPrivateKeyPath}"`;
+            this.git = simpleGit(this.gitOptions)
+                .env('GIT_SSH_COMMAND', sshCommand)
+                .env('GIT_TERMINAL_PROMPT', '0');
+        }
     }
     resetService() {
         this.git = null;
@@ -167,7 +182,8 @@ let SourceControlGitService = class SourceControlGitService {
         if (!this.git) {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized (Promise)');
         }
-        if (sourceControlPreferences.initRepo) {
+        const { branchName, initRepo, repositoryUrl } = sourceControlPreferences;
+        if (initRepo) {
             try {
                 await this.git.init();
             }
@@ -176,8 +192,8 @@ let SourceControlGitService = class SourceControlGitService {
             }
         }
         try {
-            await this.git.addRemote(constants_1.SOURCE_CONTROL_ORIGIN, sourceControlPreferences.repositoryUrl);
-            this.logger.debug(`Git remote added: ${sourceControlPreferences.repositoryUrl}`);
+            await this.git.addRemote(constants_1.SOURCE_CONTROL_ORIGIN, repositoryUrl);
+            this.logger.debug(`Git remote added: ${repositoryUrl}`);
         }
         catch (error) {
             if (error.message.includes('remote origin already exists')) {
@@ -190,12 +206,12 @@ let SourceControlGitService = class SourceControlGitService {
         await this.setGitUserDetails(user.firstName && user.lastName
             ? `${user.firstName} ${user.lastName}`
             : constants_1.SOURCE_CONTROL_DEFAULT_NAME, user.email ?? constants_1.SOURCE_CONTROL_DEFAULT_EMAIL);
-        await this.trackRemoteIfReady(sourceControlPreferences.branchName);
-        if (sourceControlPreferences.initRepo) {
+        await this.trackRemoteIfReady(branchName);
+        if (initRepo) {
             try {
                 const branches = await this.getBranches();
                 if (branches.branches?.length === 0) {
-                    await this.git.raw(['branch', '-M', sourceControlPreferences.branchName]);
+                    await this.git.raw(['branch', '-M', branchName]);
                 }
             }
             catch (error) {
@@ -286,14 +302,14 @@ let SourceControlGitService = class SourceControlGitService {
         if (!this.git) {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized (fetch)');
         }
-        await this.setGitSshCommand();
+        await this.setGitCommand();
         return await this.git.fetch();
     }
     async pull(options = { ffOnly: true }) {
         if (!this.git) {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized (pull)');
         }
-        await this.setGitSshCommand();
+        await this.setGitCommand();
         const params = {};
         if (options.ffOnly) {
             Object.assign(params, { '--ff-only': true });
@@ -308,7 +324,7 @@ let SourceControlGitService = class SourceControlGitService {
         if (!this.git) {
             throw new n8n_workflow_1.UnexpectedError('Git is not initialized ({)');
         }
-        await this.setGitSshCommand();
+        await this.setGitCommand();
         if (force) {
             return await this.git.push(constants_1.SOURCE_CONTROL_ORIGIN, branch, ['-f']);
         }