mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-23 19:47:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into renovate/master-formidable-2.x

Browse source
This commit is contained in:
Yannick Bungers 2021-12-02 19:59:39 +01:00 • committed by GitHub
commit 386c08a339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 527 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/web/imageRouter/index.js
View file

@ -3,7 +3,6 @@
const Router = require('express').Router
const formidable = require('formidable')
const path = require('path')
const FileType = require('file-type')
const fs = require('fs')
const os = require('os')
const rimraf = require('rimraf')
@ -17,7 +16,8 @@ const imageRouter = (module.exports = Router())
async function checkUploadType (filePath) {
const extension = path.extname(filePath).toLowerCase()
let typeFromMagic = await FileType.fromFile(filePath)
const FileType = await import('file-type')
let typeFromMagic = await FileType.fileTypeFromFile(filePath)
if (extension === '.svg' && (typeFromMagic === undefined || typeFromMagic.mime === 'application/xml')) {
const fileContent = fs.readFileSync(filePath)
if (isSvg(fileContent)) {