Implement proper errors for Multipart

pkg/api/api_definitions.go

@@ -104,6 +104,13 @@ type InitiateMultipartUploadResult struct {
 	UploadID string `xml:"UploadId"`
 }
 
+// completedParts is a sortable interface for Part slice
+type completedParts []Part
+
+func (a completedParts) Len() int           { return len(a) }
+func (a completedParts) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a completedParts) Less(i, j int) bool { return a[i].PartNumber < a[j].PartNumber }
+
 // CompleteMultipartUpload container for completing multipart upload
 type CompleteMultipartUpload struct {
 	Part []Part

pkg/api/api_object_handlers.go

@@ -18,6 +18,7 @@ package api
 
 import (
 	"net/http"
+	"sort"
 	"strconv"
 
 	"encoding/xml"
@@ -311,6 +312,10 @@ func (server *minioAPI) putObjectPartHandler(w http.ResponseWriter, req *http.Re
 			writeSuccessResponse(w, acceptsContentType)
 
 		}
+	case drivers.InvalidUploadID:
+		{
+			writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path)
+		}
 	case drivers.ObjectExists:
 		{
 			writeErrorResponse(w, req, MethodNotAllowed, acceptsContentType, req.URL.Path)
@@ -355,6 +360,10 @@ func (server *minioAPI) completeMultipartUploadHandler(w http.ResponseWriter, re
 		writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
 		return
 	}
+	if !sort.IsSorted(completedParts(parts.Part)) {
+		writeErrorResponse(w, req, InvalidPartOrder, acceptsContentType, req.URL.Path)
+		return
+	}
 
 	partMap := make(map[int]string)
 
@@ -366,6 +375,7 @@ func (server *minioAPI) completeMultipartUploadHandler(w http.ResponseWriter, re
 	for _, part := range parts.Part {
 		partMap[part.PartNumber] = part.ETag
 	}
+
 	etag, err := server.driver.CompleteMultipartUpload(bucket, object, uploadID, partMap)
 	switch err := iodine.ToError(err).(type) {
 	case nil:
@@ -378,8 +388,9 @@ func (server *minioAPI) completeMultipartUploadHandler(w http.ResponseWriter, re
 		w.WriteHeader(http.StatusOK)
 		// write body
 		w.Write(encodedSuccessResponse)
+	case drivers.InvalidUploadID:
+		writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path)
 	default:
-		// TODO handle all other errors, properly
 		log.Println(err)
 		writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
 	}

pkg/api/errors.go

@@ -64,11 +64,12 @@ const (
 	TooManyBuckets
 	MethodNotAllowed
 	InvalidPart
+	InvalidPartOrder
 )
 
 // Error codes, non exhaustive list - standard HTTP errors
 const (
-	NotAcceptable = iota + 24
+	NotAcceptable = iota + 25
 )
 
 // Error code to Error structure map
@@ -193,6 +194,11 @@ var errorCodeResponse = map[int]Error{
 		Description:    "One or more of the specified parts could not be found",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
+	InvalidPartOrder: {
+		Code:           "InvalidPartOrder",
+		Description:    "The list of parts was not in ascending order. The parts list must be specified in order by part number.",
+		HTTPStatusCode: http.StatusBadRequest,
+	},
 }
 
 // errorCodeError provides errorCode to Error. It returns empty if the code provided is unknown