From d220ba9b054bfac8544421e3463c06c18b28d717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksa=20Siri=C5=A1ki?=
 <31509435+aleksasiriski@users.noreply.github.com>
Date: Tue, 25 Jun 2024 21:19:47 +0200
Subject: [PATCH] fix(proxy): extract uri for favicon proxying to improve
 privacy and increase cache hit

---
 .../components/results/general/single.svelte    |  4 ++--
 src/lib/functions/api/proxyimage.js             | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/results/general/single.svelte b/src/lib/components/results/general/single.svelte
index 902db1f4..430b36ed 100644
--- a/src/lib/components/results/general/single.svelte
+++ b/src/lib/components/results/general/single.svelte
@@ -1,6 +1,6 @@
 <script>
 	import Logo from '$lib/assets/logo.svg';
-	import { proxyImageLink } from '$lib/functions/api/proxyimage';
+	import { proxyFaviconLink } from '$lib/functions/api/proxyimage';
 
 	/**
 	 * @typedef {object} Props
@@ -12,7 +12,7 @@
 
 	const favicon =
 		result.favicon_hash && result.favicon_hash != ''
-			? proxyImageLink(result.url, result.favicon_hash, true)
+			? proxyFaviconLink(result.url, result.favicon_hash)
 			: Logo;
 
 	const shortDesc =
diff --git a/src/lib/functions/api/proxyimage.js b/src/lib/functions/api/proxyimage.js
index 42f08424..efc2a004 100644
--- a/src/lib/functions/api/proxyimage.js
+++ b/src/lib/functions/api/proxyimage.js
@@ -27,3 +27,20 @@ export function proxyImageLink(url, hash, favicon = false) {
 
 	return apiUrl.toString();
 }
+
+/**
+ * Create a public API URL for the proxy favicon image endpoint
+ * @param {string} url
+ * @param {string} hash
+ * @returns {string}
+ */
+export function proxyFaviconLink(url, hash) {
+	const uriPattern = '^(http(s?))(://)([^/]+)';
+	const uriRegex = new RegExp(uriPattern);
+	const uriMatch = url.match(uriRegex);
+	if (!uriMatch || uriMatch.length == 0) {
+		throw error(400, 'Invalid URL');
+	}
+	const uri = uriMatch[0];
+	return proxyImageLink(uri, hash, true);
+}