From 47979bf16d05aecd190c767e38a553eb8c2887c4 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 19 Dec 2022 22:11:21 +0100 Subject: [PATCH] fix: secrets --- apps/api/src/jobs/deployApplication.ts | 12 ++++++------ apps/api/src/lib/buildPacks/common.ts | 12 ++++++------ apps/api/src/lib/buildPacks/compose.ts | 6 +++--- apps/api/src/lib/buildPacks/deno.ts | 6 +++--- apps/api/src/lib/buildPacks/docker.ts | 2 +- apps/api/src/lib/buildPacks/nextjs.ts | 6 +++--- apps/api/src/lib/buildPacks/node.ts | 6 +++--- apps/api/src/lib/buildPacks/nuxtjs.ts | 6 +++--- apps/api/src/lib/buildPacks/php.ts | 6 +++--- apps/api/src/lib/buildPacks/python.ts | 6 +++--- apps/api/src/lib/buildPacks/static.ts | 6 +++--- apps/api/src/routes/api/v1/applications/handlers.ts | 12 ++++++------ apps/server/src/trpc/routers/applications/index.ts | 8 ++++---- 13 files changed, 47 insertions(+), 47 deletions(-) diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts index b09bd5a4e..7970ab488 100644 --- a/apps/api/src/jobs/deployApplication.ts +++ b/apps/api/src/jobs/deployApplication.ts @@ -148,13 +148,13 @@ import * as buildpacks from '../lib/buildPacks'; (s) => s.name === secret.name && s.isPRMRSecret ); if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { envs.push(`${secret.name}=${isSecretFound[0].value}`); } else { envs.push(`${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -162,7 +162,7 @@ import * as buildpacks from '../lib/buildPacks'; } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -718,13 +718,13 @@ import * as buildpacks from '../lib/buildPacks'; (s) => s.name === secret.name && s.isPRMRSecret ); if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n') || isSecretFound[0].value.includes("'")) { envs.push(`${secret.name}=${isSecretFound[0].value}`); } else { envs.push(`${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -732,7 +732,7 @@ import * as buildpacks from '../lib/buildPacks'; } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts index 14645e599..01e10df7e 100644 --- a/apps/api/src/lib/buildPacks/common.ts +++ b/apps/api/src/lib/buildPacks/common.ts @@ -792,13 +792,13 @@ export async function buildCacheImageWithNode(data, imageForBuild) { if (pullmergeRequestId) { const isSecretFound = secrets.filter((s) => s.name === secret.name && s.isPRMRSecret); if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -806,7 +806,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -842,14 +842,14 @@ export async function buildCacheImageForLaravel(data, imageForBuild) { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -857,7 +857,7 @@ export async function buildCacheImageForLaravel(data, imageForBuild) { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts index dd52a2bbd..8b380247c 100644 --- a/apps/api/src/lib/buildPacks/compose.ts +++ b/apps/api/src/lib/buildPacks/compose.ts @@ -31,13 +31,13 @@ export default async function (data) { if (pullmergeRequestId) { const isSecretFound = secrets.filter((s) => s.name === secret.name && s.isPRMRSecret); if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { envs.push(`${secret.name}='${isSecretFound[0].value}'`); } else { envs.push(`${secret.name}=${isSecretFound[0].value}`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -45,7 +45,7 @@ export default async function (data) { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/deno.ts b/apps/api/src/lib/buildPacks/deno.ts index f2197cb86..d1b2678b9 100644 --- a/apps/api/src/lib/buildPacks/deno.ts +++ b/apps/api/src/lib/buildPacks/deno.ts @@ -29,14 +29,14 @@ const createDockerfile = async (data, image): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -44,7 +44,7 @@ const createDockerfile = async (data, image): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/docker.ts b/apps/api/src/lib/buildPacks/docker.ts index ea1362ae1..309261b2e 100644 --- a/apps/api/src/lib/buildPacks/docker.ts +++ b/apps/api/src/lib/buildPacks/docker.ts @@ -21,7 +21,7 @@ export default async function (data) { ) { Dockerfile.forEach((line, index) => { if (line.startsWith('FROM')) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.splice(index + 1, 0, `ARG ${secret.name}=${secret.value}`); } else { Dockerfile.splice(index + 1, 0, `ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/nextjs.ts b/apps/api/src/lib/buildPacks/nextjs.ts index fd9bf5299..2d7891f9e 100644 --- a/apps/api/src/lib/buildPacks/nextjs.ts +++ b/apps/api/src/lib/buildPacks/nextjs.ts @@ -29,13 +29,13 @@ const createDockerfile = async (data, image): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secrets.value.includes('\\n')) { + if (secrets.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -43,7 +43,7 @@ const createDockerfile = async (data, image): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secrets.value.includes('\\n')) { + if (secrets.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/node.ts b/apps/api/src/lib/buildPacks/node.ts index cdaf0c689..10e942d95 100644 --- a/apps/api/src/lib/buildPacks/node.ts +++ b/apps/api/src/lib/buildPacks/node.ts @@ -25,14 +25,14 @@ const createDockerfile = async (data, image): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -40,7 +40,7 @@ const createDockerfile = async (data, image): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/nuxtjs.ts b/apps/api/src/lib/buildPacks/nuxtjs.ts index eee21f00f..2bb7f0dad 100644 --- a/apps/api/src/lib/buildPacks/nuxtjs.ts +++ b/apps/api/src/lib/buildPacks/nuxtjs.ts @@ -29,14 +29,14 @@ const createDockerfile = async (data, image): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -44,7 +44,7 @@ const createDockerfile = async (data, image): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/php.ts b/apps/api/src/lib/buildPacks/php.ts index 26f52596d..c0f6d5d51 100644 --- a/apps/api/src/lib/buildPacks/php.ts +++ b/apps/api/src/lib/buildPacks/php.ts @@ -18,14 +18,14 @@ const createDockerfile = async (data, image, htaccessFound): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -33,7 +33,7 @@ const createDockerfile = async (data, image, htaccessFound): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/python.ts b/apps/api/src/lib/buildPacks/python.ts index ef526899d..9ce8bb331 100644 --- a/apps/api/src/lib/buildPacks/python.ts +++ b/apps/api/src/lib/buildPacks/python.ts @@ -23,14 +23,14 @@ const createDockerfile = async (data, image): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -38,7 +38,7 @@ const createDockerfile = async (data, image): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/lib/buildPacks/static.ts b/apps/api/src/lib/buildPacks/static.ts index c9f97e31b..dd158df4a 100644 --- a/apps/api/src/lib/buildPacks/static.ts +++ b/apps/api/src/lib/buildPacks/static.ts @@ -30,14 +30,14 @@ const createDockerfile = async (data, image): Promise => { if (pullmergeRequestId) { const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`); } else { Dockerfile.push(`ARG ${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); @@ -45,7 +45,7 @@ const createDockerfile = async (data, image): Promise => { } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { Dockerfile.push(`ARG ${secret.name}=${secret.value}`); } else { Dockerfile.push(`ARG ${secret.name}='${secret.value}'`); diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index 00faff097..c0399959a 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -468,14 +468,14 @@ export async function restartApplication(request: FastifyRequest s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { envs.push(`${secret.name}=${isSecretFound[0].value}`); } else { envs.push(`${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -483,7 +483,7 @@ export async function restartApplication(request: FastifyRequest s.name === secret.name && s.isPRMRSecret) if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n')|| isSecretFound[0].value.includes("'")) { envs.push(`${secret.name}=${isSecretFound[0].value}`); } else { envs.push(`${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -1196,7 +1196,7 @@ export async function restartPreview(request: FastifyRequest s.name === secret.name && s.isPRMRSecret); if (isSecretFound.length > 0) { - if (isSecretFound[0].value.includes('\\n')) { + if (isSecretFound[0].value.includes('\\n') || isSecretFound[0].value.includes("'")) { envs.push(`${secret.name}=${isSecretFound[0].value}`); } else { envs.push(`${secret.name}='${isSecretFound[0].value}'`); } } else { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); @@ -224,12 +224,12 @@ export const applicationsRouter = router({ } } else { if (!secret.isPRMRSecret) { - if (secret.value.includes('\\n')) { + if (secret.value.includes('\\n')|| secret.value.includes("'")) { envs.push(`${secret.name}=${secret.value}`); } else { envs.push(`${secret.name}='${secret.value}'`); } - } + } } }); }