refactor(serverHandler/upload): check formname==file explicitly

Author: marjune163

src/serverHandler/upload.go

@@ -81,18 +81,20 @@ func (h *handler) saveUploadFiles(fsPrefix string, createDir, overwriteExists bo
 				continue
 			}
 			filepath := partFilePath[0:filenameIndex]
-			prefixSlashIndex := strings.IndexByte(filepath, '/')
-			if prefixSlashIndex > 0 {
-				fsInfix = filepath[prefixSlashIndex+1:]
+			if prefixEndIndex := strings.IndexByte(filepath, '/'); prefixEndIndex > 0 {
+				fsInfix = filepath[prefixEndIndex+1:]
 			}
-		} else if formname != file {
+		} else if formname == file {
+			// noop
+		} else {
+			errs = append(errs, errors.New("upload: unknown mode "+formname))
 			continue
 		}
 
 		filePrefix := fsPrefix
 		if len(fsInfix) > 0 {
 			if !createDir {
-				errs = append(errs, errors.New("Upload failed: mkdir is not enabled for "+fsPrefix))
+				errs = append(errs, errors.New("upload: mkdir is not enabled for "+fsPrefix))
 				continue
 			}
 

test/case/011.alias.upload.bash

@@ -11,9 +11,14 @@ sleep 0.05 # wait server ready
 cleanup
 
 content='my/upload/uploaded.tmp'
-curl_upload_content 'http://127.0.0.1:3003/my/upload?upload' files "$content" uploaded.tmp
+curl_upload_content 'http://127.0.0.1:3003/my/upload?upload' file "$content" uploaded.tmp
 uploaded=$(cat "$fs"/uploaded/2/uploaded.tmp)
 assert "$uploaded" "$content"
 
+content='my/upload/uploaded2.tmp'
+curl_upload_content 'http://127.0.0.1:3003/my/upload?upload' file "$content" 'temp/dir/uploaded2.tmp'
+uploaded=$(cat "$fs"/uploaded/2/uploaded2.tmp)
+assert "$uploaded" "$content"
+
 cleanup
 jobs -p | xargs kill