misskey-dev/media-proxy
1
0
Fork 0
mirror of https://github.com/misskey-dev/media-proxy.git synced 2025-04-29 02:47:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

revert FILE_TYPE_BROWSERSAFE規制を復活

Browse Source 
BROWSERSAFEではないならTYPE_OCTET_STREAMにする
This commit is contained in:
tamaina 2023-02-09 13:11:17 +00:00
parent b415f59b72
commit ddc778d208
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
built/file-info.js
View File

@ -26,6 +26,9 @@ export async function detectType(path) {
if (type.mime === 'application/xml' && await checkSvg(path)) { if (type.mime === 'application/xml' && await checkSvg(path)) {
return TYPE_SVG; return TYPE_SVG;
} }
if (isMimeImage(type.mime, 'safe-file')) {
return TYPE_OCTET_STREAM;
}
return { return {
mime: type.mime, mime: type.mime,
ext: type.ext, ext: type.ext,

4
built/index.js
View File

@ -3,7 +3,6 @@ import { fileURLToPath } from 'node:url';
import { dirname } from 'node:path'; import { dirname } from 'node:path';
import fastifyStatic from '@fastify/static'; import fastifyStatic from '@fastify/static';
import { createTemp } from './create-temp.js'; import { createTemp } from './create-temp.js';
import { FILE_TYPE_BROWSERSAFE } from './const.js';
import { convertToWebpStream, webpDefault } from './image-processor.js'; import { convertToWebpStream, webpDefault } from './image-processor.js';
import { detectType, isMimeImage } from './file-info.js'; import { detectType, isMimeImage } from './file-info.js';
import sharp from 'sharp'; import sharp from 'sharp';
@ -149,9 +148,6 @@ async function proxyHandler(request, reply) {
else if (file.mime === 'image/svg+xml') { else if (file.mime === 'image/svg+xml') {
image = convertToWebpStream(file.path, 2048, 2048); image = convertToWebpStream(file.path, 2048, 2048);
} }
else if (!file.mime.startsWith('image/') || !FILE_TYPE_BROWSERSAFE.includes(file.mime)) {
throw new StatusError('Rejected type', 403, 'Rejected type');
}
if (!image) { if (!image) {
image = { image = {
data: fs.createReadStream(file.path), data: fs.createReadStream(file.path),

4
src/file-info.ts
View File

@ -34,6 +34,10 @@ export async function detectType(path: string): Promise<{
return TYPE_SVG; return TYPE_SVG;
} }
if (isMimeImage(type.mime, 'safe-file')) {
return TYPE_OCTET_STREAM;
}
return { return {
mime: type.mime, mime: type.mime,
ext: type.ext, ext: type.ext,

2
src/index.ts
View File

@ -191,8 +191,6 @@ async function proxyHandler(request: FastifyRequest<{ Params: { url: string; };
}; };
} else if (file.mime === 'image/svg+xml') { } else if (file.mime === 'image/svg+xml') {
image = convertToWebpStream(file.path, 2048, 2048); image = convertToWebpStream(file.path, 2048, 2048);
} else if (!file.mime.startsWith('image/') || !FILE_TYPE_BROWSERSAFE.includes(file.mime)) {
throw new StatusError('Rejected type', 403, 'Rejected type');
} }
if (!image) { if (!image) {