ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-28 20:59:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent webhook errors to be logged

Browse Source
This commit is contained in:
Andras Bacsai
2022-11-29 14:50:24 +01:00
parent b461635834
commit a55720091c
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/api/src/routes/webhooks/gitlab/handlers.ts
View File

@@ -44,7 +44,7 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
const allowedActions = ['opened', 'reopen', 'close', 'open', 'update'];
const webhookToken = request.headers['x-gitlab-token'];
if (!webhookToken && !isDev) {
throw { status: 500, message: 'Invalid webhookToken.' }
throw { status: 500, message: 'Invalid webhookToken.', type: 'webhook' }
}
const settings = await prisma.setting.findUnique({ where: { id: '0' } });
if (objectKind === 'push') {
@@ -96,10 +96,10 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
const pullmergeRequestId = request.body.object_attributes.iid.toString();
const projectId = Number(id);
if (!allowedActions.includes(action)) {
throw { status: 500, message: 'Action not allowed.' }
throw { status: 500, message: 'Action not allowed.', type: 'webhook' }
}
if (isDraft) {
throw { status: 500, message: 'Draft MR, do nothing.' }
throw { status: 500, message: 'Draft MR, do nothing.', type: 'webhook' }
}
const applicationsFound = await getApplicationFromDBWebhook(projectId, targetBranch);
if (applicationsFound && applicationsFound.length > 0) {
@@ -114,11 +114,11 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
}
);
if (!isRunning) {
throw { status: 500, message: 'Application not running.' }
throw { status: 500, message: 'Application not running.', type: 'webhook' }
}
}
if (!isDev && application.gitSource.gitlabApp.webhookToken !== webhookToken) {
throw { status: 500, message: 'Invalid webhookToken. Are you doing something nasty?!' }
throw { status: 500, message: 'Invalid webhookToken. Are you doing something nasty?!', type: 'webhook' }
}
if (
action === 'opened' ||
@@ -189,7 +189,7 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
}
}
}
} catch ({ status, message }) {
return errorHandler({ status, message })
} catch ({ status, message, type }) {
return errorHandler({ status, message, type })
}
}