summary refs log tree commit diff
path: root/src/api
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2024-08-28 12:39:31 +1000
committerGitHub <noreply@github.com>2024-08-28 12:39:31 +1000
commit31ac4a063cc9bdd00f62543034db862c2f5d9c4e (patch)
treeb1df435a33cd3d8dad470c6d754bb9aa20bbb1bb /src/api
parentMerge pull request #1198 from DEVTomatoCake/fix/lazy-request-filter (diff)
parentRun prettier (diff)
downloadserver-ts-31ac4a063cc9bdd00f62543034db862c2f5d9c4e.tar.xz
Merge pull request #1199 from DEVTomatoCake/fix/built-in-image-proxy
Diffstat (limited to 'src/api')
-rw-r--r--src/api/middlewares/Authentication.ts2
-rw-r--r--src/api/middlewares/ImageProxy.ts9
2 files changed, 9 insertions, 2 deletions
diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts

index ffefee8fb..ec77cbbb8 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 537c5da17..4f9eef10c 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("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 +80,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)", },