Merge pull request spacebarchat#1199 from DEVTomatoCake/fix/built-in-…

…image-proxy
DEVTomatoCake · Aug 28, 2024 · 31ac4a0 · 31ac4a0
2 parents 7e60f8b + b73b4e9
commit 31ac4a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -67,15 +67,20 @@ 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;
 	}
 
 	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)",
 		},