Skip to content

Node.js based forum software built for the modern web

fix: drop the filename when an uploaded file has no extension (#14839)

palmoni517b202f9ce3c
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 9f5d37ae5e..be70dde5ea 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -182,7 +182,8 @@ async function saveFileToLocal(uid, folder, uploadedFile) {
const name = uploadedFile.name || 'upload';
const extension = path.extname(name) || '';
- const filename = `${Date.now()}-${name.slice(0, -extension.length).slice(0, 255)}${extension}`;
+ const basename = extension ? name.slice(0, -extension.length) : name;
+ const filename = `${Date.now()}-${basename.slice(0, 255)}${extension}`;
const upload = await file.saveFileToLocal(filename, folder, uploadedFile.path);
const storedFile = {
diff --git a/test/files/noextension b/test/files/noextension
new file mode 100644
index 0000000000..bf16d81a85
--- /dev/null
+++ b/test/files/noextension
@@ -0,0 +1 @@
+plain text fixture without an extension
diff --git a/test/uploads.js b/test/uploads.js
index 8b057b4409..57638f1e0a 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -190,6 +190,16 @@ describe('Upload Controllers', () => {
assert.deepStrictEqual(Object.keys(body.response.images[0]), ['url', 'name']);
});
+ it('should keep the original name when the file has no extension', async () => {
+ const oldValue = meta.config.allowedFileExtensions;
+ meta.config.allowedFileExtensions = '';
+ const { response, body } = await helpers.uploadFile(`${nconf.get('url')}/api/post/upload`, path.join(__dirname, '../test/files/noextension'), {}, jar, csrf_token);
+ meta.config.allowedFileExtensions = oldValue;
+
+ assert.strictEqual(response.statusCode, 200);
+ assert(body.response.images[0].url.endsWith('-noextension'));
+ });
+
it('should upload a file with utf8 characters in the name to a post', async () => {
const { body } = await helpers.uploadFile(`${nconf.get('url')}/api/post/upload`, path.join(__dirname, '../test/files/测试.jpg'), {}, jar, csrf_token);