dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: reuse ssh connection

Browse Source
This commit is contained in:
Andras Bacsai
2022-07-27 13:57:42 +00:00
parent 71ce2eb0a7
commit b07ad4e3fa
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/api/src/lib/common.ts
View File

@@ -482,16 +482,32 @@ export async function createRemoteEngineConfiguration(id: string) {
const { sshKey: { privateKey }, remoteIpAddress, remotePort, remoteUser } = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } }) const { sshKey: { privateKey }, remoteIpAddress, remotePort, remoteUser } = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } })
await fs.writeFile(sshKeyFile, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 }) await fs.writeFile(sshKeyFile, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 })
// Needed for remote docker compose // Needed for remote docker compose
const { stdout: numberOfSSHAgentsRunning } = await asyncExecShell(`ps ax | grep [s]sh-agent | wc -l`) const { stdout: numberOfSSHAgentsRunning } = await asyncExecShell(`ps ax | grep [s]sh-agent | grep ssh-agent.pid | grep -v grep | wc -l`)
if (numberOfSSHAgentsRunning !== '' && Number(numberOfSSHAgentsRunning.trim()) == 0) { if (numberOfSSHAgentsRunning !== '' && Number(numberOfSSHAgentsRunning.trim()) == 0) {
await asyncExecShell(`eval $(ssh-agent -s) && ssh-add -q ${sshKeyFile}`) await asyncExecShell(`eval $(ssh-agent -sa /tmp/ssh-agent.pid)`)
} }
await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh-add -q ${sshKeyFile}`)
const { stdout: numberOfSSHTunnelsRunning } = await asyncExecShell(`ps ax | grep 'ssh -fNL 11122:localhost:22' | grep -v grep | wc -l`)
console.log(numberOfSSHTunnelsRunning)
if (numberOfSSHTunnelsRunning !== '' && Number(numberOfSSHTunnelsRunning.trim()) == 0) {
try {
await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh -fNL 11122:localhost:22 ${remoteIpAddress}`)
} catch(error){
console.log(error)
}
}
const config = sshConfig.parse('') const config = sshConfig.parse('')
const found = config.find({ Host: remoteIpAddress }) const found = config.find({ Host: remoteIpAddress })
if (!found) { if (!found) {
config.append({ config.append({
Host: remoteIpAddress, Host: remoteIpAddress,
Port: remotePort.toString(), Hostname: 'localhost',
Port: '11122',
User: remoteUser, User: remoteUser,
IdentityFile: sshKeyFile, IdentityFile: sshKeyFile,
StrictHostKeyChecking: 'no' StrictHostKeyChecking: 'no'
@@ -502,19 +518,24 @@ export async function createRemoteEngineConfiguration(id: string) {
} catch (error) { } catch (error) {
await fs.mkdir(`${homedir}/.ssh/`) await fs.mkdir(`${homedir}/.ssh/`)
} }
return await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config))
await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config))
return
} }
export async function executeDockerCmd({ dockerId, command }: { dockerId: string, command: string }) { export async function executeDockerCmd({ dockerId, command }: { dockerId: string, command: string }) {
let { remoteEngine, remoteIpAddress, remoteUser, engine } = await prisma.destinationDocker.findUnique({ where: { id: dockerId } }) let { remoteEngine, remoteIpAddress, engine } = await prisma.destinationDocker.findUnique({ where: { id: dockerId } })
if (remoteEngine) { if (remoteEngine) {
engine = `ssh://${remoteUser}@${remoteIpAddress}`
await createRemoteEngineConfiguration(dockerId) await createRemoteEngineConfiguration(dockerId)
engine = `ssh://${remoteIpAddress}`
} else { } else {
engine = 'unix:///var/run/docker.sock' engine = 'unix:///var/run/docker.sock'
} }
return await asyncExecShell( return await asyncExecShell(
`DOCKER_BUILDKIT=1 DOCKER_HOST="${engine}" ${command}` `DOCKER_BUILDKIT=1 DOCKER_HOST="${engine}" ${command}`
); );
} }
export async function startTraefikProxy(id: string): Promise<void> { export async function startTraefikProxy(id: string): Promise<void> {
const { engine, network, remoteEngine, remoteIpAddress } = await prisma.destinationDocker.findUnique({ where: { id } }) const { engine, network, remoteEngine, remoteIpAddress } = await prisma.destinationDocker.findUnique({ where: { id } })