MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1239 from awwalker/verify-headers 

api: CopyObject - verify the additional headers before starting to write.
This commit is contained in:
Harshavardhana 2016-03-16 18:37:56 -07:00
parent c784707ed8 34f2c5bcdf
commit facd5a9ffd
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
object-handlers.go
View File

@ -345,6 +345,20 @@ func (api storageAPI) CopyObjectHandler(w http.ResponseWriter, r *http.Request)
}
return
}
// Verify before writing.
// Verify x-amz-copy-source-if-modified-since and
// x-amz-copy-source-if-unmodified-since.
lastModified := objectInfo.ModifiedTime
if checkCopySourceLastModified(w, r, lastModified) {
return
}
// Verify x-amz-copy-source-if-match and
// x-amz-copy-source-if-none-match.
if checkCopySourceETag(w, r) {
return
}
/// maximum Upload size for object in a single CopyObject operation.
if isMaxObjectSize(objectInfo.Size) {
@ -397,20 +411,6 @@ func (api storageAPI) CopyObjectHandler(w http.ResponseWriter, r *http.Request)
encodedSuccessResponse := encodeResponse(response)
// write headers
setCommonHeaders(w)
// Verify x-amz-copy-source-if-modified-since and
// x-amz-copy-source-if-unmodified-since
lastModified := objectInfo.ModifiedTime
if checkCopySourceLastModified(w, r, lastModified) {
return
}
// Verify x-amz-copy-source-if-match and
// x-amz-copy-source-if-none-match
if checkCopySourceETag(w, r) {
return
}
// write success response.
writeSuccessResponse(w, encodedSuccessResponse)
}