Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(discord-bot): verify signatures against the original request body

Aditya Garud62fdd975e2de
diff --git a/apps/discord-bot/src/index.ts b/apps/discord-bot/src/index.ts
index 3b2d0846a..6e273c286 100644
--- a/apps/discord-bot/src/index.ts
+++ b/apps/discord-bot/src/index.ts
@@ -59,11 +59,13 @@ type Message = {
const app = new Hono<{ Bindings: Env }>();
app.post("/interactions", async (c) => {
- const body = await c.req.json();
+ const rawBody = await c.req.text();
- const verification = await verifyRequest(c.req.raw, body);
+ const verification = verifyRequest(c.req.raw, rawBody);
if (!verification) return new Response("Invalid signature", { status: 401 });
+ const body = JSON.parse(rawBody);
+
// Ping
if (body.type === 1) return Response.json({ type: 1 });
@@ -266,17 +268,16 @@ async function handleCommand(interaction: InteractionBody, env: Env) {
}
}
-async function verifyRequest(request: Request, jsonBody: unknown) {
+function verifyRequest(request: Request, rawBody: string) {
const signature = request.headers.get("X-Signature-Ed25519");
- if (!signature) throw new Error("Signature header not found");
-
const timestamp = request.headers.get("X-Signature-Timestamp");
- if (!timestamp) throw new Error("Timestamp header not found");
+ if (!signature || !/^[0-9a-f]{128}$/i.test(signature) || !timestamp)
+ return false;
return nacl.sign.detached.verify(
- new Buffer(timestamp + JSON.stringify(jsonBody)),
- new Buffer(signature, "hex"),
- new Buffer(PUBLIC_KEY, "hex"),
+ Buffer.from(timestamp + rawBody),
+ Buffer.from(signature, "hex"),
+ Buffer.from(PUBLIC_KEY, "hex"),
);
}
diff --git a/apps/discord-bot/test/interactions.spec.ts b/apps/discord-bot/test/interactions.spec.ts
new file mode 100644
index 000000000..165c89cb5
--- /dev/null
+++ b/apps/discord-bot/test/interactions.spec.ts
@@ -0,0 +1,98 @@
+import { env } from "cloudflare:test";
+import { Buffer } from "buffer";
+import nacl from "tweetnacl";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import worker from "../src/index";
+
+const keyPair = nacl.sign.keyPair.fromSeed(new Uint8Array(32).fill(1));
+const verify = nacl.sign.detached.verify;
+
+function signedRequest(body: string) {
+ const timestamp = "1770000000";
+ const signature = nacl.sign.detached(
+ Buffer.from(timestamp + body),
+ keyPair.secretKey,
+ );
+
+ return new Request("https://example.com/interactions", {
+ method: "POST",
+ body,
+ headers: {
+ "Content-Type": "application/json",
+ "X-Signature-Ed25519": Buffer.from(signature).toString("hex"),
+ "X-Signature-Timestamp": timestamp,
+ },
+ });
+}
+
+describe("Discord interaction signatures", () => {
+ beforeEach(() => {
+ vi.spyOn(nacl.sign.detached, "verify").mockImplementation(
+ (message, signature) => verify(message, signature, keyPair.publicKey),
+ );
+ });
+
+ afterEach(() => {
+ vi.restoreAllMocks();
+ });
+
+ it.each([
+ '{"type":1}',
+ '{ "type": 1 }\n',
+ '{"type":1,"user":{"username":"caf\\u00e9"}}',
+ ])("acknowledges a ping signed over the exact body %s", async (body) => {
+ const response = await worker.fetch(signedRequest(body), env);
+
+ expect(response.status).toBe(200);
+ expect(await response.json()).toEqual({ type: 1 });
+ });
+
+ it("rejects a changed body even when its parsed JSON is unchanged", async () => {
+ const request = new Request(signedRequest('{"type":1}'), {
+ body: '{ "type": 1 }',
+ });
+ const response = await worker.fetch(request, env);
+
+ expect(response.status).toBe(401);
+ });
+
+ it("rejects a changed timestamp", async () => {
+ const request = signedRequest('{"type":1}');
+ request.headers.set("X-Signature-Timestamp", "1770000001");
+ const response = await worker.fetch(request, env);
+
+ expect(response.status).toBe(401);
+ });
+
+ it.each(["X-Signature-Ed25519", "X-Signature-Timestamp"])(
+ "rejects a missing %s header",
+ async (header) => {
+ const request = signedRequest('{"type":1}');
+ request.headers.delete(header);
+ const response = await worker.fetch(request, env);
+
+ expect(response.status).toBe(401);
+ },
+ );
+
+ it.each(["00", "zz".repeat(64), "00".repeat(64)])(
+ "rejects an invalid signature %s",
+ async (signature) => {
+ const request = signedRequest('{"type":1}');
+ request.headers.set("X-Signature-Ed25519", signature);
+ const response = await worker.fetch(request, env);
+
+ expect(response.status).toBe(401);
+ },
+ );
+
+ it("checks the signature before parsing untrusted JSON", async () => {
+ const request = new Request("https://example.com/interactions", {
+ method: "POST",
+ body: "not JSON",
+ });
+ const response = await worker.fetch(request, env);
+
+ expect(response.status).toBe(401);
+ });
+});