fix: closes #13729, fix filename encoding

src/middleware/multer.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const multer = require('multer');
+const storage = multer.diskStorage({});
+const upload = multer({ storage,
+	// from https://github.com/TriliumNext/Trilium/pull/3058/files
+	fileFilter: (req, file, cb) => {
+		// UTF-8 file names are not well decoded by multer/busboy, so we handle the conversion on our side.
+		// See https://github.com/expressjs/multer/pull/1102.
+		file.originalname = Buffer.from(file.originalname, 'latin1').toString('utf-8');
+		cb(null, true);
+	}
+});
+
+module.exports = upload;
+

src/routes/admin.js

@@ -85,9 +85,7 @@ function apiRoutes(router, name, middleware, controllers) {
 	router.post(`/api/${name}/manage/categories/:cid/name`, middleware.ensureLoggedIn, helpers.tryRoute(controllers.admin.categories.renameRemote));
 	router.delete(`/api/${name}/manage/categories/:cid`, middleware.ensureLoggedIn, helpers.tryRoute(controllers.admin.categories.removeRemote));
 
-	const multer = require('multer');
+	const upload = require('../middleware/multer');
-	const storage = multer.diskStorage({});
-	const upload = multer({ storage });
 
 	const middlewares = [
 		upload.array('files[]', 20),

src/routes/api.js

@@ -23,9 +23,7 @@ module.exports = function (app, middleware, controllers) {
 	router.get('/topic/teaser/:topic_id', [...middlewares], helpers.tryRoute(controllers.topics.teaser));
 	router.get('/topic/pagination/:topic_id', [...middlewares], helpers.tryRoute(controllers.topics.pagination));
 
-	const multer = require('multer');
+	const upload = require('../middleware/multer');
-	const storage = multer.diskStorage({});
-	const upload = multer({ storage });
 
 	const postMiddlewares = [
 		middleware.maintenanceMode,

src/routes/authentication.js

@@ -154,10 +154,7 @@ Auth.reloadRoutes = async function (params) {
 		});
 	});
 
-
+	const upload = require('../middleware/multer')
-	const multer = require('multer');
-	const storage = multer.diskStorage({});
-	const upload = multer({ storage });
 	const middlewares = [
 		upload.any(),
 		Auth.middleware.applyCSRF,

src/routes/helpers.js

@@ -54,9 +54,7 @@ helpers.setupApiRoute = function (...args) {
 	const [router, verb, name] = args;
 	let middlewares = args.length > 4 ? args[args.length - 2] : [];
 	const controller = args[args.length - 1];
-	const multer = require('multer');
+	const upload = require('../middleware/multer');
-	const storage = multer.diskStorage({});
-	const upload = multer({ storage });
 	middlewares = [
 		middleware.autoLocale,
 		middleware.applyBlacklist,