mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-11-22 09:46:30 -05:00
c85b11463d
A change in the minio JS SDK resulted in uploads being stored with a defect metadata object in minio, resulting in all files served as application/octet-stream. This was caused as the fifth argument to putObject is a metadata object and not the content-type alone anymore. Signed-off-by: Erik Michelson <github@erik.michelson.eu>
50 lines
1.5 KiB
JavaScript
50 lines
1.5 KiB
JavaScript
'use strict'
|
|
const fs = require('fs')
|
|
const path = require('path')
|
|
|
|
const config = require('../../config')
|
|
const { getImageMimeType } = require('../../utils')
|
|
const logger = require('../../logger')
|
|
|
|
const Minio = require('minio')
|
|
const minioClient = new Minio.Client({
|
|
endPoint: config.minio.endPoint,
|
|
port: config.minio.port,
|
|
useSSL: config.minio.secure,
|
|
accessKey: config.minio.accessKey,
|
|
secretKey: config.minio.secretKey
|
|
})
|
|
|
|
exports.uploadImage = function (imagePath, callback) {
|
|
if (!imagePath || typeof imagePath !== 'string') {
|
|
callback(new Error('Image path is missing or wrong'), null)
|
|
return
|
|
}
|
|
|
|
if (!callback || typeof callback !== 'function') {
|
|
logger.error('Callback has to be a function')
|
|
return
|
|
}
|
|
|
|
fs.readFile(imagePath, function (err, buffer) {
|
|
if (err) {
|
|
callback(new Error(err), null)
|
|
return
|
|
}
|
|
|
|
const key = path.join('uploads', path.basename(imagePath))
|
|
const protocol = config.minio.secure ? 'https' : 'http'
|
|
|
|
minioClient.putObject(config.s3bucket, key, buffer, buffer.size, {
|
|
'Content-Type': getImageMimeType(imagePath) || 'application/octet-stream'
|
|
}, function (err, data) {
|
|
if (err) {
|
|
callback(new Error(err), null)
|
|
return
|
|
}
|
|
const hidePort = [80, 443].includes(config.minio.port)
|
|
const urlPort = hidePort ? '' : `:${config.minio.port}`
|
|
callback(null, `${protocol}://${config.minio.endPoint}${urlPort}/${config.s3bucket}/${key}`)
|
|
})
|
|
})
|
|
}
|