yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload path can be absolute

Browse Source 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
This commit is contained in:
Pierre Noël 2020-07-31 17:37:16 +02:00
parent 97922f99ae
commit c8207b7809
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-upload/controllers/upload/admin.js
View File

@ -211,7 +211,5 @@ const findEntityAndCheckPermissions = async (ability, action, model, id) => {
throw strapi.errors.forbidden(); throw strapi.errors.forbidden();
} }
console.log(fileWithRoles);
return { pm, file }; return { pm, file };
}; };

11
packages/strapi-plugin-upload/middlewares/upload/index.js
View File

@ -1,15 +1,18 @@
'use strict'; 'use strict';
const { join } = require('path'); const { join, isAbsolute } = require('path');
const range = require('koa-range'); const range = require('koa-range');
const koaStatic = require('koa-static'); const koaStatic = require('koa-static');
module.exports = strapi => ({ module.exports = strapi => ({
initialize() { initialize() {
const staticDir = join( const configPublicPath = strapi.config.get(
strapi.dir, 'middleware.settings.public.path',
strapi.config.middleware.settings.public.path || strapi.config.paths.static strapi.config.paths.static
); );
const staticDir = isAbsolute(configPublicPath)
? configPublicPath
: join(strapi.dir, configPublicPath);
strapi.app.on('error', err => { strapi.app.on('error', err => {
if (err.code === 'EPIPE') { if (err.code === 'EPIPE') {

9
packages/strapi-provider-upload-local/lib/index.js
View File

@ -23,10 +23,13 @@ module.exports = {
}); });
} }
}; };
const uploadDir = path.join( const configPublicPath = strapi.config.get(
strapi.dir, 'middleware.settings.public.path',
strapi.config.get('middleware.settings.public.path', strapi.config.paths.static) strapi.config.paths.static
); );
const uploadDir = path.isAbsolute(configPublicPath)
? configPublicPath
: path.join(strapi.dir, configPublicPath);
return { return {
upload(file) { upload(file) {