immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-19 09:13:14 +03:00
Code Issues Packages Projects Releases 17 Wiki Activity

Fix external library path validation #8319 (#8366)

Browse Source 
* Fix isImmichPath

* prettier write

* Fis isImmichPath code comment

* Refactor isImmichPath function based on team suggestions

* Test isImmichPath

* fix: clean comments

* Refactor isImmichPath test based on team suggestions

* Clean code with lintern suggestions
This commit is contained in:
Pablo Diz
2024-03-31 16:47:03 +02:00
committed by GitHub
parent 34cbb18ecd
commit 6a4bc777a2
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/cores/storage.core.ts
View File

@@ -115,7 +115,13 @@ export class StorageCore {
}
static isImmichPath(path: string) {
return resolve(path).startsWith(resolve(APP_MEDIA_LOCATION));
const resolvedPath = resolve(path);
const resolvedAppMediaLocation = resolve(APP_MEDIA_LOCATION);
const normalizedPath = resolvedPath.endsWith('/') ? resolvedPath : resolvedPath + '/';
const normalizedAppMediaLocation = resolvedAppMediaLocation.endsWith('/')
? resolvedAppMediaLocation
: resolvedAppMediaLocation + '/';
return normalizedPath.startsWith(normalizedAppMediaLocation);
}
static isGeneratedAsset(path: string) {