From 359f4520f52f899d38cdc6ce44563ec542fceb58 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 16 Jan 2023 11:45:45 +0100 Subject: [PATCH] test template + tags during dev --- apps/api/.gitignore | 4 +- apps/api/src/index.ts | 18 +- apps/api/src/routes/api/v1/handlers.ts | 246 ++++++++++-------- .../icons/services/ServiceIcons.svelte | 2 + .../svg/services/ServiceIcons.svelte | 2 + 5 files changed, 156 insertions(+), 116 deletions(-) diff --git a/apps/api/.gitignore b/apps/api/.gitignore index 9d4e0d4e8..8614cdee9 100644 --- a/apps/api/.gitignore +++ b/apps/api/.gitignore @@ -8,4 +8,6 @@ package !.env.example dist dev.db -client \ No newline at end of file +client +testTemplate.yaml +testTags.json \ No newline at end of file diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 275b65702..1ab6acd47 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -225,8 +225,22 @@ async function getTagsTemplates() { const { default: got } = await import('got'); try { if (isDev) { - const templates = await fs.readFile('./devTemplates.yaml', 'utf8'); - const tags = await fs.readFile('./devTags.json', 'utf8'); + let templates = await fs.readFile('./devTemplates.yaml', 'utf8'); + let tags = await fs.readFile('./devTags.json', 'utf8'); + try { + if (await fs.stat('./testTemplate.yaml')) { + templates = templates + (await fs.readFile('./testTemplate.yaml', 'utf8')); + } + } catch (error) {} + try { + if (await fs.stat('./testTags.json')) { + const testTags = await fs.readFile('./testTags.json', 'utf8'); + if (testTags.length > 0) { + tags = JSON.stringify(JSON.parse(tags).concat(JSON.parse(testTags))); + } + } + } catch (error) {} + await fs.writeFile('./templates.json', JSON.stringify(yaml.load(templates))); await fs.writeFile('./tags.json', tags); console.log('[004] Tags and templates loaded in dev mode...'); diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts index 438d8a275..382635800 100644 --- a/apps/api/src/routes/api/v1/handlers.ts +++ b/apps/api/src/routes/api/v1/handlers.ts @@ -1,6 +1,6 @@ -import { compareVersions } from "compare-versions"; -import cuid from "cuid"; -import bcrypt from "bcryptjs"; +import { compareVersions } from 'compare-versions'; +import cuid from 'cuid'; +import bcrypt from 'bcryptjs'; import fs from 'fs/promises'; import yaml from 'js-yaml'; import { @@ -13,12 +13,12 @@ import { uniqueName, version, sentryDSN, - executeCommand, -} from "../../../lib/common"; -import { scheduler } from "../../../lib/scheduler"; -import type { FastifyReply, FastifyRequest } from "fastify"; -import type { Login, Update } from "."; -import type { GetCurrentUser } from "./types"; + executeCommand +} from '../../../lib/common'; +import { scheduler } from '../../../lib/scheduler'; +import type { FastifyReply, FastifyRequest } from 'fastify'; +import type { Login, Update } from '.'; +import type { GetCurrentUser } from './types'; export async function hashPassword(password: string): Promise { const saltRounds = 15; @@ -29,9 +29,9 @@ export async function backup(request: FastifyRequest) { try { const { backupData } = request.params; let std = null; - const [id, backupType, type, zipped, storage] = backupData.split(':') - console.log(id, backupType, type, zipped, storage) - const database = await prisma.database.findUnique({ where: { id } }) + const [id, backupType, type, zipped, storage] = backupData.split(':'); + console.log(id, backupType, type, zipped, storage); + const database = await prisma.database.findUnique({ where: { id } }); if (database) { // await executeDockerCmd({ // dockerId: database.destinationDockerId, @@ -40,8 +40,7 @@ export async function backup(request: FastifyRequest) { std = await executeCommand({ dockerId: database.destinationDockerId, command: `docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v coolify-local-backup:/app/backups -e CONTAINERS_TO_BACKUP="${backupData}" coollabsio/backup` - }) - + }); } if (std.stdout) { return std.stdout; @@ -58,7 +57,7 @@ export async function cleanupManually(request: FastifyRequest) { try { const { serverId } = request.body; const destination = await prisma.destinationDocker.findUnique({ - where: { id: serverId }, + where: { id: serverId } }); await cleanupDockerStorage(destination.id, true, true); return {}; @@ -68,17 +67,25 @@ export async function cleanupManually(request: FastifyRequest) { } export async function refreshTags() { try { - const { default: got } = await import('got') + const { default: got } = await import('got'); try { if (isDev) { - const tags = await fs.readFile('./devTags.json', 'utf8') - await fs.writeFile('./tags.json', tags) + let tags = await fs.readFile('./devTags.json', 'utf8'); + try { + if (await fs.stat('./testTags.json')) { + const testTags = await fs.readFile('./testTags.json', 'utf8'); + if (testTags.length > 0) { + tags = JSON.parse(tags).concat(JSON.parse(testTags)); + } + } + } catch (error) {} + await fs.writeFile('./tags.json', tags); } else { - const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text() - await fs.writeFile('/app/tags.json', tags) + const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text(); + await fs.writeFile('/app/tags.json', tags); } } catch (error) { - console.log(error) + console.log(error); } return {}; @@ -88,17 +95,25 @@ export async function refreshTags() { } export async function refreshTemplates() { try { - const { default: got } = await import('got') + const { default: got } = await import('got'); try { if (isDev) { - const response = await fs.readFile('./devTemplates.yaml', 'utf8') - await fs.writeFile('./templates.json', JSON.stringify(yaml.load(response))) + let templates = await fs.readFile('./devTemplates.yaml', 'utf8'); + try { + if (await fs.stat('./testTemplate.yaml')) { + templates = templates + (await fs.readFile('./testTemplate.yaml', 'utf8')); + } + } catch (error) {} + const response = await fs.readFile('./devTemplates.yaml', 'utf8'); + await fs.writeFile('./templates.json', JSON.stringify(yaml.load(response))); } else { - const response = await got.get('https://get.coollabs.io/coolify/service-templates.yaml').text() - await fs.writeFile('/app/templates.json', JSON.stringify(yaml.load(response))) + const response = await got + .get('https://get.coollabs.io/coolify/service-templates.yaml') + .text(); + await fs.writeFile('/app/templates.json', JSON.stringify(yaml.load(response))); } } catch (error) { - console.log(error) + console.log(error); } return {}; } catch ({ status, message }) { @@ -107,28 +122,29 @@ export async function refreshTemplates() { } export async function checkUpdate(request: FastifyRequest) { try { - const { default: got } = await import('got') + const { default: got } = await import('got'); const isStaging = - request.hostname === "staging.coolify.io" || - request.hostname === "arm.coolify.io"; + request.hostname === 'staging.coolify.io' || request.hostname === 'arm.coolify.io'; const currentVersion = version; - const { coolify } = await got.get('https://get.coollabs.io/versions.json', { - searchParams: { - appId: process.env['COOLIFY_APP_ID'] || undefined, - version: currentVersion - } - }).json() + const { coolify } = await got + .get('https://get.coollabs.io/versions.json', { + searchParams: { + appId: process.env['COOLIFY_APP_ID'] || undefined, + version: currentVersion + } + }) + .json(); const latestVersion = coolify.main.version; const isUpdateAvailable = compareVersions(latestVersion, currentVersion); if (isStaging) { return { isUpdateAvailable: true, - latestVersion: "next", + latestVersion: 'next' }; } return { isUpdateAvailable: isStaging ? true : isUpdateAvailable === 1, - latestVersion, + latestVersion }; } catch ({ status, message }) { return errorHandler({ status, message }); @@ -142,8 +158,13 @@ export async function update(request: FastifyRequest) { const { isAutoUpdateEnabled } = await prisma.setting.findFirst(); await executeCommand({ command: `docker pull coollabsio/coolify:${latestVersion}` }); await executeCommand({ shell: true, command: `env | grep COOLIFY > .env` }); - await executeCommand({ command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env` }); - await executeCommand({ shell: true, command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` }); + await executeCommand({ + command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env` + }); + await executeCommand({ + shell: true, + command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` + }); return {}; } else { await asyncSleep(2000); @@ -156,12 +177,12 @@ export async function update(request: FastifyRequest) { export async function resetQueue(request: FastifyRequest) { try { const teamId = request.user.teamId; - if (teamId === "0") { + if (teamId === '0') { await prisma.build.updateMany({ - where: { status: { in: ["queued", "running"] } }, - data: { status: "canceled" }, + where: { status: { in: ['queued', 'running'] } }, + data: { status: 'canceled' } }); - scheduler.workers.get("deployApplication").postMessage("cancel"); + scheduler.workers.get('deployApplication').postMessage('cancel'); } } catch ({ status, message }) { return errorHandler({ status, message }); @@ -170,7 +191,7 @@ export async function resetQueue(request: FastifyRequest) { export async function restartCoolify(request: FastifyRequest) { try { const teamId = request.user.teamId; - if (teamId === "0") { + if (teamId === '0') { if (!isDev) { await executeCommand({ command: `docker restart coolify` }); return {}; @@ -180,7 +201,7 @@ export async function restartCoolify(request: FastifyRequest) { } throw { status: 500, - message: "You are not authorized to restart Coolify.", + message: 'You are not authorized to restart Coolify.' }; } catch ({ status, message }) { return errorHandler({ status, message }); @@ -192,43 +213,52 @@ export async function showDashboard(request: FastifyRequest) { const userId = request.user.userId; const teamId = request.user.teamId; let applications = await prisma.application.findMany({ - where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, - include: { settings: true, destinationDocker: true, teams: true }, + where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }, + include: { settings: true, destinationDocker: true, teams: true } }); const databases = await prisma.database.findMany({ - where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, - include: { settings: true, destinationDocker: true, teams: true }, + where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }, + include: { settings: true, destinationDocker: true, teams: true } }); const services = await prisma.service.findMany({ - where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, - include: { destinationDocker: true, teams: true }, + where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }, + include: { destinationDocker: true, teams: true } }); const gitSources = await prisma.gitSource.findMany({ - where: { OR: [{ teams: { some: { id: teamId === "0" ? undefined : teamId } } }, { isSystemWide: true }] }, - include: { teams: true }, + where: { + OR: [ + { teams: { some: { id: teamId === '0' ? undefined : teamId } } }, + { isSystemWide: true } + ] + }, + include: { teams: true } }); const destinations = await prisma.destinationDocker.findMany({ - where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, - include: { teams: true }, + where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }, + include: { teams: true } }); const settings = await listSettings(); let foundUnconfiguredApplication = false; for (const application of applications) { - if (((!application.buildPack || !application.branch) && !application.simpleDockerfile) || !application.destinationDockerId || (!application.settings?.isBot && !application?.fqdn) && application.buildPack !== "compose") { - foundUnconfiguredApplication = true + if ( + ((!application.buildPack || !application.branch) && !application.simpleDockerfile) || + !application.destinationDockerId || + (!application.settings?.isBot && !application?.fqdn && application.buildPack !== 'compose') + ) { + foundUnconfiguredApplication = true; } } let foundUnconfiguredService = false; for (const service of services) { if (!service.fqdn) { - foundUnconfiguredService = true + foundUnconfiguredService = true; } } let foundUnconfiguredDatabase = false; for (const database of databases) { if (!database.version) { - foundUnconfiguredDatabase = true + foundUnconfiguredDatabase = true; } } return { @@ -240,101 +270,94 @@ export async function showDashboard(request: FastifyRequest) { services, gitSources, destinations, - settings, + settings }; } catch ({ status, message }) { return errorHandler({ status, message }); } } -export async function login( - request: FastifyRequest, - reply: FastifyReply -) { +export async function login(request: FastifyRequest, reply: FastifyReply) { if (request.user) { - return reply.redirect("/dashboard"); + return reply.redirect('/dashboard'); } else { const { email, password, isLogin } = request.body || {}; if (!email || !password) { - throw { status: 500, message: "Email and password are required." }; + throw { status: 500, message: 'Email and password are required.' }; } const users = await prisma.user.count(); const userFound = await prisma.user.findUnique({ where: { email }, include: { teams: true, permission: true }, - rejectOnNotFound: false, + rejectOnNotFound: false }); if (!userFound && isLogin) { - throw { status: 500, message: "User not found." }; + throw { status: 500, message: 'User not found.' }; } const { isRegistrationEnabled, id } = await prisma.setting.findFirst(); let uid = cuid(); - let permission = "read"; + let permission = 'read'; let isAdmin = false; if (users === 0) { await prisma.setting.update({ where: { id }, - data: { isRegistrationEnabled: false }, + data: { isRegistrationEnabled: false } }); - uid = "0"; + uid = '0'; } if (userFound) { - if (userFound.type === "email") { - if (userFound.password === "RESETME") { + if (userFound.type === 'email') { + if (userFound.password === 'RESETME') { const hashedPassword = await hashPassword(password); if (userFound.updatedAt < new Date(Date.now() - 1000 * 60 * 10)) { - if (userFound.id === "0") { + if (userFound.id === '0') { await prisma.user.update({ where: { email: userFound.email }, - data: { password: "RESETME" }, + data: { password: 'RESETME' } }); } else { await prisma.user.update({ where: { email: userFound.email }, - data: { password: "RESETTIMEOUT" }, + data: { password: 'RESETTIMEOUT' } }); } throw { status: 500, - message: - "Password reset link has expired. Please request a new one.", + message: 'Password reset link has expired. Please request a new one.' }; } else { await prisma.user.update({ where: { email: userFound.email }, - data: { password: hashedPassword }, + data: { password: hashedPassword } }); return { userId: userFound.id, teamId: userFound.id, permission: userFound.permission, - isAdmin: true, + isAdmin: true }; } } - const passwordMatch = await bcrypt.compare( - password, - userFound.password - ); + const passwordMatch = await bcrypt.compare(password, userFound.password); if (!passwordMatch) { throw { status: 500, - message: "Wrong password or email address.", + message: 'Wrong password or email address.' }; } uid = userFound.id; isAdmin = true; } } else { - permission = "owner"; + permission = 'owner'; isAdmin = true; if (!isRegistrationEnabled) { throw { status: 404, - message: "Registration disabled by administrator.", + message: 'Registration disabled by administrator.' }; } const hashedPassword = await hashPassword(password); @@ -344,17 +367,17 @@ export async function login( id: uid, email, password: hashedPassword, - type: "email", + type: 'email', teams: { create: { id: uid, name: uniqueName(), - destinationDocker: { connect: { network: "coolify" } }, - }, + destinationDocker: { connect: { network: 'coolify' } } + } }, - permission: { create: { teamId: uid, permission: "owner" } }, + permission: { create: { teamId: uid, permission: 'owner' } } }, - include: { teams: true }, + include: { teams: true } }); } else { await prisma.user.create({ @@ -362,16 +385,16 @@ export async function login( id: uid, email, password: hashedPassword, - type: "email", + type: 'email', teams: { create: { id: uid, - name: uniqueName(), - }, + name: uniqueName() + } }, - permission: { create: { teamId: uid, permission: "owner" } }, + permission: { create: { teamId: uid, permission: 'owner' } } }, - include: { teams: true }, + include: { teams: true } }); } } @@ -379,23 +402,20 @@ export async function login( userId: uid, teamId: uid, permission, - isAdmin, + isAdmin }; } } -export async function getCurrentUser( - request: FastifyRequest, - fastify -) { +export async function getCurrentUser(request: FastifyRequest, fastify) { let token = null; const { teamId } = request.query; try { const user = await prisma.user.findUnique({ - where: { id: request.user.userId }, + where: { id: request.user.userId } }); if (!user) { - throw "User not found"; + throw 'User not found'; } } catch (error) { throw { status: 401, message: error }; @@ -404,17 +424,15 @@ export async function getCurrentUser( try { const user = await prisma.user.findFirst({ where: { id: request.user.userId, teams: { some: { id: teamId } } }, - include: { teams: true, permission: true }, + include: { teams: true, permission: true } }); if (user) { - const permission = user.permission.find( - (p) => p.teamId === teamId - ).permission; + const permission = user.permission.find((p) => p.teamId === teamId).permission; const payload = { ...request.user, teamId, permission: permission || null, - isAdmin: permission === "owner" || permission === "admin", + isAdmin: permission === 'owner' || permission === 'admin' }; token = fastify.jwt.sign(payload); } @@ -422,12 +440,14 @@ export async function getCurrentUser( // No new token -> not switching teams } } - const pendingInvitations = await prisma.teamInvitation.findMany({ where: { uid: request.user.userId } }) + const pendingInvitations = await prisma.teamInvitation.findMany({ + where: { uid: request.user.userId } + }); return { - settings: await prisma.setting.findUnique({ where: { id: "0" } }), + settings: await prisma.setting.findUnique({ where: { id: '0' } }), sentryDSN, pendingInvitations, token, - ...request.user, + ...request.user }; } diff --git a/apps/client/src/lib/components/icons/services/ServiceIcons.svelte b/apps/client/src/lib/components/icons/services/ServiceIcons.svelte index 7f3ead42e..3f832a3f5 100644 --- a/apps/client/src/lib/components/icons/services/ServiceIcons.svelte +++ b/apps/client/src/lib/components/icons/services/ServiceIcons.svelte @@ -5,6 +5,8 @@ const handleError = (ev: { target: { src: string } }) => (ev.target.src = fallback); let extension = 'png'; let svgs = [ + 'mattermost', + 'repman', 'directus', 'pocketbase', 'gitea', diff --git a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte index 7f3ead42e..3f832a3f5 100644 --- a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte +++ b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte @@ -5,6 +5,8 @@ const handleError = (ev: { target: { src: string } }) => (ev.target.src = fallback); let extension = 'png'; let svgs = [ + 'mattermost', + 'repman', 'directus', 'pocketbase', 'gitea',