Skip to content

High performance self-hosted photo and video management solution.

fix: error handling (#28843)

Jason Rasmussen9043bc843532
diff --git a/server/src/utils/file.ts b/server/src/utils/file.ts
index 04f1ce48d9..edd411dd40 100644
--- a/server/src/utils/file.ts
+++ b/server/src/utils/file.ts
@@ -1,4 +1,4 @@
-import { HttpException, StreamableFile } from '@nestjs/common';
+import { HttpException, NotFoundException, StreamableFile } from '@nestjs/common';
import { NextFunction, Response } from 'express';
import { access, constants } from 'node:fs/promises';
import { basename, extname } from 'node:path';
@@ -52,6 +52,9 @@ export const sendFile = async (
try {
const file = await handler();
+
+ await access(file.path, constants.R_OK);
+
const cacheControlHeader = cacheControlHeaders[file.cacheControl];
if (cacheControlHeader) {
// set the header to Cache-Control
@@ -63,8 +66,6 @@ export const sendFile = async (
res.header('Content-Disposition', `inline; filename*=UTF-8''${encodeURIComponent(file.fileName)}`);
}
- await access(file.path, constants.R_OK);
-
return await _sendFile(file.path, { dotfiles: 'allow' });
} catch (error: Error | any) {
// ignore client-closed connection
@@ -77,8 +78,7 @@ export const sendFile = async (
logger.error(`Unable to send file: ${error}`, error.stack);
}
- res.header('Cache-Control', 'none');
- next(error);
+ next(new NotFoundException());
}
};