From 6b2a453b8f7adace01ff3908c6ffab2eba1ed2d2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 20 Jan 2023 10:10:36 +0100 Subject: [PATCH] fix: deletion + cleanupStuckedContainers --- apps/api/src/index.ts | 5 ++ .../routes/api/v1/applications/handlers.ts | 9 +-- .../src/routes/api/v1/databases/handlers.ts | 14 ++-- apps/api/src/routes/api/v1/databases/types.ts | 2 +- .../src/routes/api/v1/services/handlers.ts | 23 +++++++ .../server/src/trpc/routers/services/index.ts | 23 +++++++ .../routes/applications/[id]/__layout.svelte | 2 +- .../routes/applications/[id]/danger.svelte | 2 +- .../src/routes/databases/[id]/__layout.svelte | 2 +- apps/ui/src/routes/index.svelte | 64 +++++++++---------- .../src/routes/services/[id]/__layout.svelte | 4 +- .../ui/src/routes/services/[id]/danger.svelte | 6 +- 12 files changed, 99 insertions(+), 57 deletions(-) diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 9975523a3..b3214ecee 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -171,6 +171,11 @@ const host = '0.0.0.0'; await cleanupStorage(); }, 60000 * 15); + // Cleanup stucked containers (not defined in Coolify, but still running and managed by Coolify) + setInterval(async () => { + await cleanupStuckedContainers(); + }, 60000 * 5); + // checkProxies, checkFluentBit & refresh templates setInterval(async () => { await checkProxies(); diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index 94cf19e95..dd669ca33 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -732,14 +732,15 @@ export async function deleteApplication( ) { try { const { id } = request.params; - const { force } = request.body; - const { teamId } = request.user; const application = await prisma.application.findUnique({ where: { id }, - include: { destinationDocker: true } + include: { destinationDocker: true, teams: true } }); - if (!force && application?.destinationDockerId && application.destinationDocker?.network) { + if (!application.teams.find((team) => team.id === teamId) || teamId !== '0') { + throw { status: 403, message: 'You are not allowed to delete this application.' }; + } + if (application?.destinationDocker?.id && application.destinationDocker?.network) { const { stdout: containers } = await executeCommand({ dockerId: application.destinationDocker.id, command: `docker ps -a --filter network=${application.destinationDocker.network} --filter name=${id} --format '{{json .}}'` diff --git a/apps/api/src/routes/api/v1/databases/handlers.ts b/apps/api/src/routes/api/v1/databases/handlers.ts index 6127ac25e..982699fde 100644 --- a/apps/api/src/routes/api/v1/databases/handlers.ts +++ b/apps/api/src/routes/api/v1/databases/handlers.ts @@ -427,19 +427,15 @@ export async function deleteDatabase(request: FastifyRequest) { try { const teamId = request.user.teamId; const { id } = request.params; - const { force } = request.body; const database = await prisma.database.findFirst({ where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } }, include: { destinationDocker: true, settings: true } }); - if (!force) { - if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword); - if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword); - if (database.destinationDockerId) { - const everStarted = await stopDatabaseContainer(database); - if (everStarted) - await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort); - } + if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword); + if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword); + if (database.destinationDockerId) { + const everStarted = await stopDatabaseContainer(database); + if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort); } await prisma.databaseSettings.deleteMany({ where: { databaseId: id } }); await prisma.databaseSecret.deleteMany({ where: { databaseId: id } }); diff --git a/apps/api/src/routes/api/v1/databases/types.ts b/apps/api/src/routes/api/v1/databases/types.ts index ba9b0b8e9..554521e21 100644 --- a/apps/api/src/routes/api/v1/databases/types.ts +++ b/apps/api/src/routes/api/v1/databases/types.ts @@ -4,7 +4,7 @@ export interface SaveDatabaseType extends OnlyId { Body: { type: string } } export interface DeleteDatabase extends OnlyId { - Body: { force: string } + Body: { } } export interface SaveVersion extends OnlyId { Body: { diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts index 3b1319202..ba87aa6f3 100644 --- a/apps/api/src/routes/api/v1/services/handlers.ts +++ b/apps/api/src/routes/api/v1/services/handlers.ts @@ -617,6 +617,29 @@ export async function getServiceLogs(request: FastifyRequest) { export async function deleteService(request: FastifyRequest) { try { const { id } = request.params; + const teamId = request.user.teamId; + const { destinationDockerId } = await getServiceFromDB({ id, teamId }); + if (destinationDockerId) { + const { stdout: containers } = await executeCommand({ + dockerId: destinationDockerId, + command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}` + }); + if (containers) { + const containerArray = containers.split('\n'); + if (containerArray.length > 0) { + for (const container of containerArray) { + await executeCommand({ + dockerId: destinationDockerId, + command: `docker stop -t 0 ${container}` + }); + await executeCommand({ + dockerId: destinationDockerId, + command: `docker rm --force ${container}` + }); + } + } + } + } await removeService({ id }); return {}; } catch ({ status, message }) { diff --git a/apps/server/src/trpc/routers/services/index.ts b/apps/server/src/trpc/routers/services/index.ts index 755446ee1..c4c1e4b57 100644 --- a/apps/server/src/trpc/routers/services/index.ts +++ b/apps/server/src/trpc/routers/services/index.ts @@ -827,6 +827,29 @@ export const servicesRouter = router({ .mutation(async ({ input }) => { // todo: check if user is allowed to delete service const { id } = input; + const teamId = ctx.user?.teamId; + const { destinationDockerId } = await getServiceFromDB({ id, teamId }); + if (destinationDockerId) { + const { stdout: containers } = await executeCommand({ + dockerId: destinationDockerId, + command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}` + }); + if (containers) { + const containerArray = containers.split('\n'); + if (containerArray.length > 0) { + for (const container of containerArray) { + await executeCommand({ + dockerId: destinationDockerId, + command: `docker stop -t 0 ${container}` + }); + await executeCommand({ + dockerId: destinationDockerId, + command: `docker rm --force ${container}` + }); + } + } + } + } await prisma.serviceSecret.deleteMany({ where: { serviceId: id } }); await prisma.serviceSetting.deleteMany({ where: { serviceId: id } }); await prisma.servicePersistentStorage.deleteMany({ where: { serviceId: id } }); diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte index 502861a93..6e29cf9b3 100644 --- a/apps/ui/src/routes/applications/[id]/__layout.svelte +++ b/apps/ui/src/routes/applications/[id]/__layout.svelte @@ -89,7 +89,7 @@ const sure = confirm($t('application.confirm_to_delete', { name })); if (sure) { try { - await del(`/applications/${id}`, { id, force }); + await del(`/applications/${id}`, {}); return await goto('/'); } catch (error) { if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) { diff --git a/apps/ui/src/routes/applications/[id]/danger.svelte b/apps/ui/src/routes/applications/[id]/danger.svelte index 373520362..9d65bb65e 100644 --- a/apps/ui/src/routes/applications/[id]/danger.svelte +++ b/apps/ui/src/routes/applications/[id]/danger.svelte @@ -34,7 +34,7 @@ if (sure) { $status.application.initialLoading = true; try { - await del(`/applications/${id}`, { id, force }); + await del(`/applications/${id}`,{}); return await goto('/') } catch (error) { if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) { diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte index 1feb5be48..5d170a9fa 100644 --- a/apps/ui/src/routes/databases/[id]/__layout.svelte +++ b/apps/ui/src/routes/databases/[id]/__layout.svelte @@ -75,7 +75,7 @@ if (sure) { $status.database.initialLoading = true; try { - await del(`/databases/${database.id}`, { id: database.id, force }); + await del(`/databases/${database.id}`, {}); return await window.location.assign('/'); } catch (error) { return errorNotification(error); diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte index f2d3b6d4e..3c47041e2 100644 --- a/apps/ui/src/routes/index.svelte +++ b/apps/ui/src/routes/index.svelte @@ -437,7 +437,7 @@ try { const sure = confirm('Are you sure? This will delete this application!'); if (sure) { - await del(`/applications/${id}`, { force: true }); + await del(`/applications/${id}`, {}); return window.location.reload(); } } catch (error) { @@ -459,7 +459,7 @@ try { const sure = confirm('Are you sure? This will delete this database!'); if (sure) { - await del(`/databases/${id}`, { force: true }); + await del(`/databases/${id}`, { }); return window.location.reload(); } } catch (error) { @@ -784,11 +784,11 @@ {/if} {#if $appSession.isAdmin} - + {/if} @@ -899,11 +899,11 @@ {/if} {#if $appSession.isAdmin} - + {/if} @@ -996,11 +996,11 @@ {/if} {#if $appSession.isAdmin} - + {/if} @@ -1084,11 +1084,11 @@ {/if} {#if $appSession.isAdmin} - + {/if} @@ -1182,11 +1182,11 @@ {/if} {#if $appSession.isAdmin} - + {/if} @@ -1270,11 +1270,11 @@ {/if} {#if $appSession.isAdmin} - + {/if} diff --git a/apps/ui/src/routes/services/[id]/__layout.svelte b/apps/ui/src/routes/services/[id]/__layout.svelte index d5a56937e..03e850c6a 100644 --- a/apps/ui/src/routes/services/[id]/__layout.svelte +++ b/apps/ui/src/routes/services/[id]/__layout.svelte @@ -85,9 +85,7 @@ if (sure) { $status.service.initialLoading = true; try { - if (service.type && $status.service.isRunning) - await post(`/services/${service.id}/stop`, {}); - await del(`/services/${service.id}`, { id: service.id }); + await del(`/services/${service.id}`, {}); return await goto('/'); } catch (error) { return errorNotification(error); diff --git a/apps/ui/src/routes/services/[id]/danger.svelte b/apps/ui/src/routes/services/[id]/danger.svelte index b99b8b738..9f95c65a5 100644 --- a/apps/ui/src/routes/services/[id]/danger.svelte +++ b/apps/ui/src/routes/services/[id]/danger.svelte @@ -28,16 +28,12 @@ import { goto } from '$app/navigation'; const { id } = $page.params; - let forceDelete = false; async function deleteService() { const sure = confirm($t('application.confirm_to_delete', { name: service.name })); if (sure) { $status.service.initialLoading = true; try { - if (service.type && $status.service.overallStatus !== 'stopped') { - await post(`/services/${service.id}/stop`, {}); - } - await del(`/services/${service.id}`, { id: service.id }); + await del(`/services/${service.id}`, {}); return await goto('/'); } catch (error) { return errorNotification(error);