nhcarrigan/rosalia-nightsong
2
0
Fork 0
generated from nhcarrigan/template
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: add more logging

Browse Source
This commit is contained in:
Naomi Carrigan
2025-07-06 12:53:21 -07:00
parent 5d4621df83
commit a3d0753a66
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/validateWebhook.ts
View File

@ -5,6 +5,7 @@
*/ */
import nacl from "tweetnacl"; import nacl from "tweetnacl";
import { applicationData } from "../config/applicationData.js"; import { applicationData } from "../config/applicationData.js";
import { sendDiscord } from "./discord.js";
import type { Entitlement } from "../interfaces/entitlement.js"; import type { Entitlement } from "../interfaces/entitlement.js";
import type { FastifyRequest } from "fastify"; import type { FastifyRequest } from "fastify";
@ -20,6 +21,7 @@ export const validateWebhook = (
const { application_id: applicationId } = request.body; const { application_id: applicationId } = request.body;
const appData = applicationData[applicationId]; const appData = applicationData[applicationId];
if (appData === undefined) { if (appData === undefined) {
void sendDiscord(`[NOTIFICATION]: Invalid Application ID`, `Received an entitlement event for an invalid application ID: ${applicationId}`);
return false; return false;
} }
const signature = request.headers["x-signature-ed25519"]; const signature = request.headers["x-signature-ed25519"];
@ -30,9 +32,13 @@ export const validateWebhook = (
|| timestamp === undefined || timestamp === undefined
|| rawBody === undefined || rawBody === undefined
) { ) {
void sendDiscord(
`[NOTIFICATION]: Invalid Webhook Signature`,
`Received an entitlement event with a missing signature or timestamp.\nApplication ID: ${applicationId}\nSignature: ${signature}\nTimestamp: ${timestamp}\nRaw Body: ${rawBody}`,
);
return false; return false;
} }
return nacl.sign.detached.verify( const isValid = nacl.sign.detached.verify(
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- Being lazy here, tbh. // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- Being lazy here, tbh.
Buffer.from(`${timestamp}${rawBody}`), Buffer.from(`${timestamp}${rawBody}`),
Buffer.from( Buffer.from(
@ -43,4 +49,11 @@ export const validateWebhook = (
), ),
Buffer.from(process.env.DISCORD_PUBLIC_KEY ?? "", "hex"), Buffer.from(process.env.DISCORD_PUBLIC_KEY ?? "", "hex"),
); );
if (!isValid) {
void sendDiscord(
`[NOTIFICATION]: Invalid Webhook Signature`,
`Received an entitlement event with an invalid signature.\nApplication ID: ${applicationId}\nSignature: ${signature}\nTimestamp: ${timestamp}\nRaw Body: ${rawBody}`,
);
}
return isValid;
}; };