laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix not to reject non-image file uploads (#6664)

Browse Source 
* fix not to reject non-image file uploads

* handle an error from sharp
This commit is contained in:
coord_e 2020-08-22 04:25:25 +09:00 committed by GitHub
parent eb70d6f226
commit aa55acedc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/drive/add-file.ts
View File

@ -160,7 +160,18 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
}
}
const img = sharp(path);
if (!['image/jpeg', 'image/png', 'image/webp'].includes(type)) {
logger.debug(`web image and thumbnail not created (not an required file)`);
return {
webpublic: null,
thumbnail: null
};
}
let img: sharp.Sharp | null = null;
try {
img = sharp(path);
const metadata = await img.metadata();
const isAnimated = metadata.pages && metadata.pages > 1;
@ -171,6 +182,13 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
thumbnail: null
};
}
} catch (e) {
logger.warn(`sharp failed: ${e}`);
return {
webpublic: null,
thumbnail: null
};
}
// #region webpublic
let webpublic: IImage | null = null;