From 0b6f14930067f74ef28ae2dbcf6b0a027d56b209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20M=C3=BCller?= <peter@crycode.de>
Date: Wed, 30 Aug 2023 17:51:53 +0200
Subject: [PATCH] Fixed false upload ok return message, Updated readme

Ref #31
---
 README.md             |  5 ++++
 http-server-upload.js | 58 +++++++++++++++++++++++++------------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 3d56a75..6edbf38 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,11 @@ curl \
   http://localhost:8080/upload
 ```
 
+Example for uploading content from a pipe:
+```
+cat my-file.dat | curl -F "uploads=@-;filename=my-file.dat;type=application/octet-stream" http://localhost:8080/upload
+```
+Notice the required `filename` and `type` defintions for uploading piped data.
 
 ## License
 
diff --git a/http-server-upload.js b/http-server-upload.js
index 6773bc9..5a8eaa0 100644
--- a/http-server-upload.js
+++ b/http-server-upload.js
@@ -153,6 +153,23 @@ while (myArgs.length > 0) {
 
 console.log(`Upload target dir is ${uploadDir}`);
 
+/**
+ * Cleanup uploaded temp files.
+ * @param {formidable.File[] | undefined} uploads
+ */
+async function cleanupUploads (uploads) {
+  if (!uploads) return;
+
+  for (const file of uploads) {
+    if (!file) continue;
+    try {
+      await fsPromises.unlink(file.filepath);
+    } catch (err) {
+      console.log(`Error removing temporary file! ${file.filepath} ${err}`);
+    }
+  }
+}
+
 // create the server instance
 const server = http.createServer();
 
@@ -164,7 +181,7 @@ server.on('request', (req, res) => {
     const form = new formidable.IncomingForm({
       uploadDir: uploadTmpDir,
       multiples: true,
-      maxFileSize: maxFileSize
+      maxFileSize: maxFileSize,
     });
 
     form.parse(req, async (err, fields, files) => {
@@ -180,14 +197,21 @@ server.on('request', (req, res) => {
 
       if (token && fields.token !== token) {
         res.write('Wrong token!');
-        for (const file of files.uploads) {
-          if (!file) continue;
-          try {
-            await fsPromises.unlink(file.filepath);
-          } catch (err) {
-            console.log(`Error removing temporary file! ${file.filepath} ${err}`);
-          }
+        await cleanupUploads(files.uploads);
+        return res.end();
+      }
+
+      // check if any files are uploaded
+      if (!files.uploads[0]) {
+        // If a file is uploaded without Content-Type given for the multipart part
+        // it's parsed as a string field and not as file. Send a detailed error
+        // message in this case.
+        if (fields.uploads) {
+          res.write('No files uploaded! A field called "uploads" is preset but there was probably missing the "Content-Type" for it. Check the docs how to solve this.');
+        } else {
+          res.write('No files uploaded!');
         }
+        await cleanupUploads(files.uploads);
         return res.end();
       }
 
@@ -196,14 +220,7 @@ server.on('request', (req, res) => {
       if (fields.path) {
         if (!fields.path.match(pathMatchRegExp)) {
           res.write('Invalid path!');
-          for (const file of files.uploads) {
-            if (!file) continue;
-            try {
-              await fsPromises.unlink(file.filepath);
-            } catch (err) {
-              console.log(`Error removing temporary file! ${file.filepath} ${err}`);
-            }
-          }
+          await cleanupUploads(files.uploads);
           return res.end();
         }
 
@@ -228,14 +245,7 @@ server.on('request', (req, res) => {
           }
         } else {
           res.write('Path does not exist!');
-          for (const file of files.uploads) {
-            if (!file) continue;
-            try {
-              await fsPromises.unlink(file.filepath);
-            } catch (err2) {
-              console.log(`Error removing temporary file! ${file.filepath} ${err2}`);
-            }
-          }
+          await cleanupUploads(files.uploads);
           return res.end();
         }
       }