From 1daf6c1c4b16ff550162e835aa3a9f1c797ef75c Mon Sep 17 00:00:00 2001
From: Alan Grainger <alan.grainger@gmail.com>
Date: Tue, 12 Nov 2024 10:27:26 +0100
Subject: [PATCH] Fix #15 Support live photos and HEIC images

---
 app/src/index.ts  | 10 ++++++++--
 app/src/render.ts |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/index.ts b/app/src/index.ts
index e690069..1122b95 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -2,7 +2,7 @@ import express from 'express'
 import immich from './immich'
 import render from './render'
 import dayjs from 'dayjs'
-import { AssetType } from './types'
+import { AssetType, ImageSize } from './types'
 import { decrypt } from './encrypt'
 import { log, toString, addResponseHeaders } from './functions'
 
@@ -36,6 +36,12 @@ app.get('/:type(photo|video)/:key/:id/:size?', async (req, res) => {
   addResponseHeaders(res)
   // Check for valid key and ID
   if (immich.isKey(req.params.key) && immich.isId(req.params.id)) {
+    // Validate the size parameter
+    if (req.params.size && !Object.values(ImageSize).includes(req.params.size as ImageSize)) {
+      log('Invalid size parameter ' + req.path)
+      res.status(404).send()
+      return
+    }
     let password
     // Validate the password payload, if one was provided
     if (req.query?.cr && req.query?.iv) {
@@ -59,7 +65,7 @@ app.get('/:type(photo|video)/:key/:id/:size?', async (req, res) => {
       const asset = sharedLink.assets.find(x => x.id === req.params.id)
       if (asset) {
         asset.type = req.params.type === 'video' ? AssetType.video : AssetType.image
-        render.assetBuffer(request, res, asset, immich.validateImageSize(req.params.size)).then()
+        render.assetBuffer(request, res, asset, req.params.size).then()
         return
       }
     }
diff --git a/app/src/render.ts b/app/src/render.ts
index 4b817de..e1a0549 100644
--- a/app/src/render.ts
+++ b/app/src/render.ts
@@ -13,7 +13,7 @@ class Render {
   /**
    * Stream data from Immich back to the client
    */
-  async assetBuffer (req: IncomingShareRequest, res: Response, asset: Asset, size?: ImageSize) {
+  async assetBuffer (req: IncomingShareRequest, res: Response, asset: Asset, size?: ImageSize | string) {
     // Prepare the request
     const headerList = ['content-type', 'content-length', 'last-modified', 'etag']
     size = immich.validateImageSize(size)