fix: resolve CodeQL error

Fallenbagel · Oct 16, 2024 · 7ff242d · 7ff242d
1 parent 27d7371
commit 7ff242d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/server/routes/avatarproxy.ts b/server/routes/avatarproxy.ts
@@ -11,8 +11,8 @@ router.get('/*', async (req, res) => {
   let imagePath = '';
   try {
     const jellyfinAvatar = req.url.match(
-      /(.*?)(\/Users\/\w+\/Images\/Primary\/\?tag=\w+&quality=90)$/
-    )?.[2];
+      /.*?(\/Users\/\w+\/Images\/Primary\/?\?tag=\w+&quality=90)$/
+    )?.[1];
     if (!jellyfinAvatar) {
       throw new Error('Provided URL is not a Jellyfin avatar.');
     }

diff --git a/src/components/Common/CachedImage/index.tsx b/src/components/Common/CachedImage/index.tsx
@@ -18,19 +18,17 @@ const CachedImage = ({ src, type, ...props }: CachedImageProps) => {
 
   let imageUrl: string;
 
-  if (src.startsWith('/')) {
-    // that's not an image to proxy
-    imageUrl = src;
-  } else if (type === 'tmdb') {
+  if (type === 'tmdb') {
     // tmdb stuff
-    imageUrl = currentSettings.cacheImages
-      ? src.replace('https://image.tmdb.org', '/imageproxy')
-      : src;
+    imageUrl =
+      currentSettings.cacheImages && !src.startsWith('/')
+        ? src.replace('https://image.tmdb.org', '/imageproxy')
+        : src;
   } else if (type === 'avatar') {
     // jellyfin avatar (in any)
     const jellyfinAvatar = src.match(
-      /^(.*?)(\/Users\/\w+\/Images\/Primary\/\?tag=\w+&quality=90)$/
-    )?.[2];
+      /^.*?(\/Users\/\w+\/Images\/Primary\/?\?tag=\w+&quality=90)$/
+    )?.[1];
     imageUrl = jellyfinAvatar ? `/avatarproxy` + jellyfinAvatar : src;
   } else {
     return null;