From d4ff19f01366fe62dffef8fd3464a16f8d63cd25 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 3 Mar 2019 08:48:02 +0900 Subject: [PATCH] Fix SVG detection (#4401) * Fix SVG detection * remove unnecessary import --- src/misc/check-svg.ts | 12 ++++++++++++ src/server/proxy/proxy-media.ts | 4 ++-- src/services/drive/add-file.ts | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/misc/check-svg.ts diff --git a/src/misc/check-svg.ts b/src/misc/check-svg.ts new file mode 100644 index 000000000..b8c8af9ef --- /dev/null +++ b/src/misc/check-svg.ts @@ -0,0 +1,12 @@ +import * as fs from 'fs'; +import * as isSvg from 'is-svg'; + +export default function(path: string) { + try { + const size = fs.statSync(path).size; + if (size > 1 * 1024 * 1024) return false; + return isSvg(fs.readFileSync(path)); + } catch { + return false; + } +} diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index c679086d3..8560c0e1e 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -4,10 +4,10 @@ import * as tmp from 'tmp'; import * as Koa from 'koa'; import * as request from 'request'; import * as fileType from 'file-type'; -import * as isSvg from 'is-svg'; import { serverLogger } from '..'; import config from '../../config'; import { IImage, ConvertToPng } from '../../services/drive/image-processor'; +import checkSvg from '../../misc/check-svg'; export async function proxyMedia(ctx: Koa.BaseContext) { const url = 'url' in ctx.query ? ctx.query.url : 'https://' + ctx.params.url; @@ -102,7 +102,7 @@ async function detectMine(path: string) { const type = fileType(buffer); if (type) { res([type.mime, type.ext]); - } else if (isSvg(buffer)) { + } else if (checkSvg(path)) { res(['image/svg+xml', 'svg']); } else { // 種類が同定できなかったら application/octet-stream にする diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index ab9fdc0c9..3fa375e8d 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -7,7 +7,6 @@ import * as Minio from 'minio'; import * as uuid from 'uuid'; import * as sharp from 'sharp'; import * as fileType from 'file-type'; -import * as isSvg from 'is-svg'; import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile } from '../../models/drive-file'; import DriveFolder from '../../models/drive-folder'; @@ -26,6 +25,7 @@ import { GenerateVideoThumbnail } from './generate-video-thumbnail'; import { driveLogger } from './logger'; import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor'; import Instance from '../../models/instance'; +import checkSvg from '../../misc/check-svg'; const logger = driveLogger.createSubLogger('register', 'yellow'); @@ -311,7 +311,7 @@ export default async function( const type = fileType(buffer); if (type) { res([type.mime, type.ext]); - } else if (isSvg(buffer)) { + } else if (checkSvg(path)) { res(['image/svg+xml', 'svg']); } else { // 種類が同定できなかったら application/octet-stream にする