sa6anw/hedgedoc-hedgeagent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent 7c5c2f7981 36050598e8
commit 386c08a339
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)) {