From 1bf2424033185eaf9ff1f97b5403142f5b098df0 Mon Sep 17 00:00:00 2001 From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com> Date: Sun, 25 Aug 2024 06:50:34 +0200 Subject: [PATCH 1/2] Remove auth requirement & fix image path --- src/api/middlewares/Authentication.ts | 2 ++ src/api/middlewares/ImageProxy.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index ffefee8f..18785908 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -54,6 +54,8 @@ export const NO_AUTHORIZATION_ROUTES = [ /GET \/guilds\/\d+\/widget\.(json|png)/, // Connections /POST \/connections\/\w+\/callback/, + // Image proxy + /GET \/imageproxy\/[A-Za-z0-9+/]\/\d+x\d+\/.+/ ]; export const API_PREFIX = /^\/api(\/v\d+)?/; diff --git a/src/api/middlewares/ImageProxy.ts b/src/api/middlewares/ImageProxy.ts index 537c5da1..d1d0faa7 100644 --- a/src/api/middlewares/ImageProxy.ts +++ b/src/api/middlewares/ImageProxy.ts @@ -67,7 +67,7 @@ export async function ImageProxy(req: Request, res: Response) { if (!crypto.timingSafeEqual(Buffer.from(hash), Buffer.from(path[0]))) throw new Error("Invalid signature"); } catch { - console.log("Invalid signature, expected " + hash + " got " + path[0]); + console.log("[ImageProxy] Invalid signature, expected " + hash + " but got " + path[0]); res.status(403).send("Invalid signature"); return; } @@ -75,7 +75,7 @@ export async function ImageProxy(req: Request, res: Response) { const abort = new AbortController(); setTimeout(() => abort.abort(), 5000); - const request = await fetch(path.slice(2).join("/"), { + const request = await fetch("https://" + path.slice(2).join("/"), { headers: { "User-Agent": "SpacebarImageProxy/1.0.0 (https://spacebar.chat)", }, From b73b4e95028d6bfda21ed206db30084b5f1085d3 Mon Sep 17 00:00:00 2001 From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com> Date: Sun, 25 Aug 2024 06:51:30 +0200 Subject: [PATCH 2/2] Run prettier --- src/api/middlewares/Authentication.ts | 2 +- src/api/middlewares/ImageProxy.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 18785908..ec77cbbb 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -55,7 +55,7 @@ export const NO_AUTHORIZATION_ROUTES = [ // Connections /POST \/connections\/\w+\/callback/, // Image proxy - /GET \/imageproxy\/[A-Za-z0-9+/]\/\d+x\d+\/.+/ + /GET \/imageproxy\/[A-Za-z0-9+/]\/\d+x\d+\/.+/, ]; export const API_PREFIX = /^\/api(\/v\d+)?/; diff --git a/src/api/middlewares/ImageProxy.ts b/src/api/middlewares/ImageProxy.ts index d1d0faa7..4f9eef10 100644 --- a/src/api/middlewares/ImageProxy.ts +++ b/src/api/middlewares/ImageProxy.ts @@ -67,7 +67,12 @@ export async function ImageProxy(req: Request, res: Response) { if (!crypto.timingSafeEqual(Buffer.from(hash), Buffer.from(path[0]))) throw new Error("Invalid signature"); } catch { - console.log("[ImageProxy] Invalid signature, expected " + hash + " but got " + path[0]); + console.log( + "[ImageProxy] Invalid signature, expected " + + hash + + " but got " + + path[0], + ); res.status(403).send("Invalid signature"); return; }