tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sanitize upload filename

Browse Source
This commit is contained in:
Elliot DeNolf
2020-04-16 00:01:22 -04:00
parent 4d481b515f
commit dc08e36207
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/components/views/collections/Edit/index.js
View File

@@ -6,13 +6,8 @@ import DefaultTemplate from '../../../layout/DefaultTemplate';
import usePayloadAPI from '../../../../hooks/usePayloadAPI';
import Form from '../../../forms/Form';
import StickyHeader from '../../../modules/StickyHeader';
<<<<<<< HEAD
import APIURL from '../../../modules/APIURL';
import PreviewButton from '../../../controls/PreviewButton';
=======
import APIUrl from '../../../modules/APIUrl';
import Button from '../../../controls/Button';
>>>>>>> Fix APIUrl casing
import FormSubmit from '../../../forms/Submit';
import RenderFields from '../../../forms/RenderFields';
import * as fieldTypes from '../../../forms/field-types';

7
src/uploads/images/imageResizer.js
View File

@@ -1,13 +1,13 @@
const sharp = require('sharp');
const sanitize = require('sanitize-filename');
const { promisify } = require('util');
const imageSize = require('image-size');
const sizeOf = promisify(imageSize);
function getOutputImageName(sourceImage, size) {
const extension = sourceImage.split('.')
.pop();
const filenameWithoutExtension = sourceImage.substr(0, sourceImage.lastIndexOf('.')) || sourceImage;
const extension = sourceImage.split('.').pop();
const filenameWithoutExtension = sanitize(sourceImage.substr(0, sourceImage.lastIndexOf('.')) || sourceImage);
return `${filenameWithoutExtension}-${size.width}x${size.height}.${extension}`;
}
@@ -20,7 +20,6 @@ module.exports = async function resizeAndSave(config, uploadConfig, file) {
* @returns String[]
*/
const sourceImage = `${config.staticDir}/${file.name}`;
let sizes;
try {