MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-27 14:43:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #604 from harshavardhana/pr_out_head_request_should_have_content_length_for_only_successful_response_there_is_no_response_body_for_errors_just_header_is_sufficient_fixes_603

Browse Source
This commit is contained in:
Harshavardhana 2015-05-15 21:58:55 -07:00
commit b3e0b3e4dc
2 changed files with 91 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/api/api_bucket_handlers.go
View File

@ -285,11 +285,31 @@ func (server *minioAPI) putBucketACLHandler(w http.ResponseWriter, req *http.Req
// return responses such as 404 Not Found and 403 Forbidden. // return responses such as 404 Not Found and 403 Forbidden.
func (server *minioAPI) headBucketHandler(w http.ResponseWriter, req *http.Request) { func (server *minioAPI) headBucketHandler(w http.ResponseWriter, req *http.Request) {
acceptsContentType := getContentType(req) acceptsContentType := getContentType(req)
// verify if bucket allows this operation
if !server.isValidOp(w, req, acceptsContentType) {
return
}
// Always a success if isValidOp succeeds vars := mux.Vars(req)
writeSuccessResponse(w, acceptsContentType) bucket := vars["bucket"]
_, err := server.driver.GetBucketMetadata(bucket)
switch iodine.ToError(err).(type) {
case nil:
{
writeSuccessResponse(w, acceptsContentType)
}
case drivers.BucketNotFound:
{
error := getErrorCode(NoSuchBucket)
w.WriteHeader(error.HTTPStatusCode)
}
case drivers.BucketNameInvalid:
{
error := getErrorCode(InvalidBucketName)
w.WriteHeader(error.HTTPStatusCode)
}
default:
{
log.Println(err)
error := getErrorCode(InternalError)
w.WriteHeader(error.HTTPStatusCode)
}
}
} }

100
pkg/api/api_object_handlers.go
View File

@ -115,16 +115,22 @@ func (server *minioAPI) headObjectHandler(w http.ResponseWriter, req *http.Reque
} }
case drivers.ObjectNotFound: case drivers.ObjectNotFound:
{ {
writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) error := getErrorCode(NoSuchKey)
w.Header().Set("Server", "Minio")
w.WriteHeader(error.HTTPStatusCode)
} }
case drivers.ObjectNameInvalid: case drivers.ObjectNameInvalid:
{ {
writeErrorResponse(w, req, NoSuchKey, acceptsContentType, req.URL.Path) error := getErrorCode(NoSuchKey)
w.Header().Set("Server", "Minio")
w.WriteHeader(error.HTTPStatusCode)
} }
default: default:
{ {
log.Error.Println(iodine.New(err, nil)) log.Error.Println(iodine.New(err, nil))
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) error := getErrorCode(InternalError)
w.Header().Set("Server", "Minio")
w.WriteHeader(error.HTTPStatusCode)
} }
} }
} }
@ -227,17 +233,23 @@ func (server *minioAPI) newMultipartUploadHandler(w http.ResponseWriter, req *ht
uploadID, err := server.driver.NewMultipartUpload(bucket, object, "") uploadID, err := server.driver.NewMultipartUpload(bucket, object, "")
switch err := iodine.ToError(err).(type) { switch err := iodine.ToError(err).(type) {
case nil: case nil:
response := generateInitiateMultipartUploadResult(bucket, object, uploadID) {
encodedSuccessResponse := encodeSuccessResponse(response, acceptsContentType) response := generateInitiateMultipartUploadResult(bucket, object, uploadID)
// write headers encodedSuccessResponse := encodeSuccessResponse(response, acceptsContentType)
setCommonHeaders(w, getContentTypeString(acceptsContentType), len(encodedSuccessResponse)) // write headers
// write body setCommonHeaders(w, getContentTypeString(acceptsContentType), len(encodedSuccessResponse))
w.Write(encodedSuccessResponse) // write body
w.Write(encodedSuccessResponse)
}
case drivers.ObjectExists: case drivers.ObjectExists:
writeErrorResponse(w, req, MethodNotAllowed, acceptsContentType, req.URL.Path) {
writeErrorResponse(w, req, MethodNotAllowed, acceptsContentType, req.URL.Path)
}
default: default:
log.Println(iodine.New(err, nil)) {
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) log.Println(iodine.New(err, nil))
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
} }
} }
@ -346,13 +358,19 @@ func (server *minioAPI) abortMultipartUploadHandler(w http.ResponseWriter, req *
err := server.driver.AbortMultipartUpload(bucket, object, objectResourcesMetadata.UploadID) err := server.driver.AbortMultipartUpload(bucket, object, objectResourcesMetadata.UploadID)
switch err := iodine.ToError(err).(type) { switch err := iodine.ToError(err).(type) {
case nil: case nil:
setCommonHeaders(w, getContentTypeString(acceptsContentType), 0) {
w.WriteHeader(http.StatusNoContent) setCommonHeaders(w, getContentTypeString(acceptsContentType), 0)
w.WriteHeader(http.StatusNoContent)
}
case drivers.InvalidUploadID: case drivers.InvalidUploadID:
writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path) {
writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path)
}
default: default:
log.Println(err) {
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) log.Println(err)
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
} }
} }
@ -375,17 +393,23 @@ func (server *minioAPI) listObjectPartsHandler(w http.ResponseWriter, req *http.
objectResourcesMetadata, err := server.driver.ListObjectParts(bucket, object, objectResourcesMetadata) objectResourcesMetadata, err := server.driver.ListObjectParts(bucket, object, objectResourcesMetadata)
switch err := iodine.ToError(err).(type) { switch err := iodine.ToError(err).(type) {
case nil: case nil:
response := generateListPartsResult(objectResourcesMetadata) {
encodedSuccessResponse := encodeSuccessResponse(response, acceptsContentType) response := generateListPartsResult(objectResourcesMetadata)
// write headers encodedSuccessResponse := encodeSuccessResponse(response, acceptsContentType)
setCommonHeaders(w, getContentTypeString(acceptsContentType), len(encodedSuccessResponse)) // write headers
// write body setCommonHeaders(w, getContentTypeString(acceptsContentType), len(encodedSuccessResponse))
w.Write(encodedSuccessResponse) // write body
w.Write(encodedSuccessResponse)
}
case drivers.InvalidUploadID: case drivers.InvalidUploadID:
writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path) {
writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path)
}
default: default:
log.Println(err) {
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) log.Println(err)
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
} }
} }
@ -422,16 +446,22 @@ func (server *minioAPI) completeMultipartUploadHandler(w http.ResponseWriter, re
etag, err := server.driver.CompleteMultipartUpload(bucket, object, objectResourcesMetadata.UploadID, partMap) etag, err := server.driver.CompleteMultipartUpload(bucket, object, objectResourcesMetadata.UploadID, partMap)
switch err := iodine.ToError(err).(type) { switch err := iodine.ToError(err).(type) {
case nil: case nil:
response := generateCompleteMultpartUploadResult(bucket, object, "", etag) {
encodedSuccessResponse := encodeSuccessResponse(response, acceptsContentType) response := generateCompleteMultpartUploadResult(bucket, object, "", etag)
// write headers encodedSuccessResponse := encodeSuccessResponse(response, acceptsContentType)
setCommonHeaders(w, getContentTypeString(acceptsContentType), len(encodedSuccessResponse)) // write headers
// write body setCommonHeaders(w, getContentTypeString(acceptsContentType), len(encodedSuccessResponse))
w.Write(encodedSuccessResponse) // write body
w.Write(encodedSuccessResponse)
}
case drivers.InvalidUploadID: case drivers.InvalidUploadID:
writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path) {
writeErrorResponse(w, req, NoSuchUpload, acceptsContentType, req.URL.Path)
}
default: default:
log.Println(iodine.New(err, nil)) {
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path) log.Println(iodine.New(err, nil))
writeErrorResponse(w, req, InternalError, acceptsContentType, req.URL.Path)
}
} }
} }