AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents
TypeScript ai-agentai-agent-toolsai-agentsai-agents-frameworkmcpmcp-servermcp-toolsmcpsn8n-alternativeno-code-automationworkflowworkflow-automationworkflows
fix(git-sync): connect git names why the ssh connection failed (#16155)
Othman Abu Ajamieh8134bb9e9bf8
diff --git a/packages/server/api/src/app/ee/projects/project-release/git-sync/git-helper.ts b/packages/server/api/src/app/ee/projects/project-release/git-sync/git-helper.tsindex fc3b2355f49..86aa1b86539 100644--- a/packages/server/api/src/app/ee/projects/project-release/git-sync/git-helper.ts+++ b/packages/server/api/src/app/ee/projects/project-release/git-sync/git-helper.ts@@ -1,6 +1,6 @@import fs from 'fs/promises'import path from 'path'-import { ActivepiecesError, ErrorCode } from '@activepieces/core-utils'+import { ActivepiecesError, ErrorCode, isNil, tryCatch } from '@activepieces/core-utils'import { fileSystemUtils } from '@activepieces/server-utils'import { ApEnvironment, ConfigureRepoRequest, GitRepo } from '@activepieces/shared'import { FastifyBaseLogger } from 'fastify'@@ -74,7 +74,7 @@ async function createGitRepoAndReturnPaths(async function createOrGetSshKeyPath({ keyPath, sshPrivateKey }: { keyPath: string, sshPrivateKey: string }): Promise<void> {await fs.mkdir(path.dirname(keyPath), { recursive: true })- await fs.writeFile(keyPath, sshPrivateKey)+ await fs.writeFile(keyPath, `${sshPrivateKey.replace(/\r\n/g, '\n').trim()}\n`)await fs.chmod(keyPath, 0o600)}@@ -92,18 +92,22 @@ async function initGitRepo(allowUnsafeSshCommand: true,allowUnsafeProtocolOverride: true,},- }).env('GIT_SSH_COMMAND', `ssh -i ${keyPath} -o StrictHostKeyChecking=no`)+ }).env('GIT_SSH_COMMAND', `ssh -i ${keyPath} -o StrictHostKeyChecking=no -o BatchMode=yes -o ConnectTimeout=10 -o LogLevel=ERROR`)await git.init()await git.addConfig('core.symlinks', 'false')await git.addConfig('protocol.file.allow', 'never')await git.addRemote('origin', remoteUrl)await git.branch(['-M', branch])- await git.pull('origin', branch)+ const { error } = await tryCatch(() => git.raw(['pull', 'origin', branch]))+ if (!isNil(error)) {+ throw new Error(error.message.replaceAll(keyPath, '<ssh-key>').slice(-MAX_GIT_ERROR_MESSAGE_LENGTH))+ }return git}const SAFE_SLUG_PATTERN = /^[A-Za-z0-9._-]{1,128}$/const SAFE_KEY_PATH_PATTERN = /^[A-Za-z0-9._/-]+$/+const MAX_GIT_ERROR_MESSAGE_LENGTH = 2000function assertSafeSlug(slug: string): void {if (!SAFE_SLUG_PATTERN.test(slug) || slug === '.' || slug === '..') {@@ -127,7 +131,7 @@ function assertSafeKeyPath(keyPath: string): void {}}-async function validateConnection(request: ConfigureRepoRequest): Promise<void> {+async function validateConnection({ request, log }: { request: ConfigureRepoRequest, log: FastifyBaseLogger }): Promise<void> {const environment = system.getOrThrow<ApEnvironment>(AppSystemProp.ENVIRONMENT)if (environment === ApEnvironment.TESTING) {return@@ -146,12 +150,18 @@ async function validateConnection(request: ConfigureRepoRequest): Promise<void>throw new ActivepiecesError({code: ErrorCode.INVALID_GIT_CREDENTIALS,params: {- message: (error as Error).message,+ message: error instanceof Error ? error.message.replaceAll(keyPath, '<ssh-key>') : String(error),},})}finally {- await fs.rmdir(tmpFolder, { recursive: true })- await fs.unlink(keyPath)+ const { error: keyRemovalError } = await tryCatch(() => fs.rm(keyPath, { force: true }))+ if (!isNil(keyRemovalError)) {+ log.error({ error: keyRemovalError }, '[gitHelper#validateConnection] Failed to delete the temporary SSH key')+ }+ const { error: folderRemovalError } = await tryCatch(() => fs.rm(tmpFolder, { recursive: true, force: true }))+ if (!isNil(folderRemovalError)) {+ log.warn({ error: folderRemovalError }, '[gitHelper#validateConnection] Failed to delete the temporary repository folder')+ }}}diff --git a/packages/server/api/src/app/ee/projects/project-release/git-sync/git-sync.service.ts b/packages/server/api/src/app/ee/projects/project-release/git-sync/git-sync.service.tsindex 778d34da659..127d7b359f6 100644--- a/packages/server/api/src/app/ee/projects/project-release/git-sync/git-sync.service.ts+++ b/packages/server/api/src/app/ee/projects/project-release/git-sync/git-sync.service.ts@@ -12,9 +12,9 @@ import { GitRepoEntity } from './git-sync.entity'const repo = repoFactory(GitRepoEntity)-export const gitRepoService = (_log: FastifyBaseLogger) => ({+export const gitRepoService = (log: FastifyBaseLogger) => ({async upsert(request: ConfigureRepoRequest): Promise<GitRepo> {- await gitHelper.validateConnection(request)+ await gitHelper.validateConnection({ request, log })const existingRepo = await repo().findOneBy({ projectId: request.projectId })const id = existingRepo?.id ?? apId()diff --git a/packages/web/src/features/project-releases/components/connect-git-dialog.tsx b/packages/web/src/features/project-releases/components/connect-git-dialog.tsxindex 78544e4ff8c..1dfc44cf46b 100644--- a/packages/web/src/features/project-releases/components/connect-git-dialog.tsx+++ b/packages/web/src/features/project-releases/components/connect-git-dialog.tsx@@ -182,8 +182,8 @@ const ConnectGitDialog = ({ open, setOpen, showButton }: ConnectGitProps) => {</div><DialogFooter>- <DialogClose>- <Button type="button" variant={'outline'} loading={isPending}>+ <DialogClose asChild>+ <Button type="button" variant={'outline'}>{t('Cancel')}</Button></DialogClose>