fixup: bug fixes api

Author: Will Toozs

lib/api/api.js

@@ -186,11 +186,11 @@ const api = {
             }
             return { returnTagCount, isImplicitDeny };
         }
-        let bb;
+        let formDataParser;
         let fileEventData = null;
 
         if (apiMethod === 'objectPost') {
-            bb = busboy({ headers: request.headers });
+            formDataParser = busboy({ headers: request.headers });
         }
 
         return async.waterfall([
@@ -204,39 +204,41 @@ const api = {
                     request.formData = {};
                     let totalFieldSize = 0;
                     const MAX_FIELD_SIZE = 20 * 1024; // 20KB
-                    bb.on('field', (fieldname, val) => {
+                    formDataParser.on('field', (fieldname, val) => {
                         totalFieldSize += Buffer.byteLength(val, 'utf8');
                         if (totalFieldSize > MAX_FIELD_SIZE) {
                             const err = errors.MaxPostPreDataLengthExceeded;
-                            bb.emit('error', err);
+                            formDataParser.emit('error', err);
                         }
                         // Convert fieldname to lowercase for case-insensitive comparison
                         const lowerFieldname = fieldname.toLowerCase();
                         request.formData[lowerFieldname] = val;
                     });
 
-                    bb.on('file', (fieldname, file, filename, encoding, mimetype) => {
+                    formDataParser.on('file', (fieldname, file, filename, encoding, mimetype) => {
                         fileEventData = { fieldname, file, filename, encoding, mimetype };
                         return next(null);
                     });
 
-                    bb.on('finish', () => {
-                        // if fields are found but no file, continue
+                    formDataParser.on('finish', () => {
+                        // No file field == error
                         if (!fileEventData) {
-                            return next(null);
+                            const err = errors.InvalidArgument
+                                .customizeDescription('POST requires exactly one file upload per request.');
+                            formDataParser.emit('error', err);
                         }
                         return undefined;
                     });
 
-                    bb.on('error', (err) => {
+                    formDataParser.on('error', (err) => {
                         log.trace('Error processing form data:', {
                             error: err,
                         });
-                        request.unpipe(bb);
+                        request.unpipe(formDataParser);
                         return next(err);
                     });
 
-                    request.pipe(bb);
+                    request.pipe(formDataParser);
                 } else {
                     // issue 100 Continue to the client
                     writeContinue(request, response);