Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-30 19:54:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(server) utf8 original filename (#1147)

Browse Source
This commit is contained in:
Jason Rasmussen 2022-12-20 22:46:57 -05:00 committed by GitHub
parent 354593a70d
commit 21d6874e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/apps/immich/src/config/asset-upload.config.ts
View File

@ -7,6 +7,7 @@ import { existsSync, mkdirSync } from 'fs';
import { diskStorage } from 'multer'; import { diskStorage } from 'multer';
import { extname, join } from 'path'; import { extname, join } from 'path';
import sanitize from 'sanitize-filename'; import sanitize from 'sanitize-filename';
import { patchFormData } from '../utils/path-form-data.util';
export const assetUploadOption: MulterOptions = { export const assetUploadOption: MulterOptions = {
fileFilter, fileFilter,
@ -55,6 +56,8 @@ function filename(req: Request, file: Express.Multer.File, cb: any) {
return cb(new UnauthorizedException()); return cb(new UnauthorizedException());
} }
file.originalname = patchFormData(file.originalname);
const fileNameUUID = randomUUID(); const fileNameUUID = randomUUID();
if (file.fieldname === 'livePhotoData') { if (file.fieldname === 'livePhotoData') {

3
server/apps/immich/src/config/profile-image-upload.config.ts
View File

@ -6,6 +6,7 @@ import { existsSync, mkdirSync } from 'fs';
import { diskStorage } from 'multer'; import { diskStorage } from 'multer';
import { extname } from 'path'; import { extname } from 'path';
import sanitize from 'sanitize-filename'; import sanitize from 'sanitize-filename';
import { patchFormData } from '../utils/path-form-data.util';
export const profileImageUploadOption: MulterOptions = { export const profileImageUploadOption: MulterOptions = {
fileFilter, fileFilter,
@ -49,6 +50,8 @@ function filename(req: Request, file: Express.Multer.File, cb: any) {
return cb(new UnauthorizedException()); return cb(new UnauthorizedException());
} }
file.originalname = patchFormData(file.originalname);
const userId = req.user.id; const userId = req.user.id;
const fileName = `${userId}${extname(file.originalname)}`; const fileName = `${userId}${extname(file.originalname)}`;

3
server/apps/immich/src/utils/path-form-data.util.ts Normal file
View File

@ -0,0 +1,3 @@
export function patchFormData(latin1: string) {
return Buffer.from(latin1, 'latin1').toString('utf8');
}