maxObjectSize and minObjectSize limitation added at putObjectHandler()

Put() replies back with

   - EntityTooLarge with > 5GB in single PUT operation
   - EntityTooSmall with < 1B in single PUT operation
   - IncompleteBody with ho Content-Length found in HTTP request header
master
Harshavardhana 10 years ago
parent c14496f928
commit b18bb230da
  1. 15
      pkg/api/api_object_handlers.go
  2. 50
      pkg/api/utils.go

@ -139,7 +139,7 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
return return
} }
// handle PublicRead ACL here // handle ACL's here at bucket level
if !server.isValidOp(w, req, acceptsContentType) { if !server.isValidOp(w, req, acceptsContentType) {
return return
} }
@ -155,6 +155,19 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
writeErrorResponse(w, req, InvalidDigest, acceptsContentType, req.URL.Path) writeErrorResponse(w, req, InvalidDigest, acceptsContentType, req.URL.Path)
return return
} }
size := req.Header.Get("Content-Length")
if size == "" {
writeErrorResponse(w, req, IncompleteBody, acceptsContentType, req.URL.Path)
return
}
if isMaxObjectSize(size) {
writeErrorResponse(w, req, EntityTooLarge, acceptsContentType, req.URL.Path)
return
}
if isMinObjectSize(size) {
writeErrorResponse(w, req, EntityTooSmall, acceptsContentType, req.URL.Path)
return
}
err := server.driver.CreateObject(bucket, object, "", md5, req.Body) err := server.driver.CreateObject(bucket, object, "", md5, req.Body)
switch err := iodine.ToError(err).(type) { switch err := iodine.ToError(err).(type) {
case nil: case nil:

@ -1,10 +1,28 @@
/*
* Minimalist Object Storage, (C) 2015 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package api package api
import ( import (
"encoding/base64" "encoding/base64"
"strconv"
"strings" "strings"
) )
// isValidMD5 - verify if valid md5
func isValidMD5(md5 string) bool { func isValidMD5(md5 string) bool {
if md5 == "" { if md5 == "" {
return true return true
@ -15,3 +33,35 @@ func isValidMD5(md5 string) bool {
} }
return true return true
} }
// these should be configurable?
const (
// maximum object size per PUT request is 5GB
maxObjectSize = 1024 * 1024 * 1024 * 5
// minimum object size per PUT request is 1B
minObjectSize = 1
)
// isMaxObjectSize - verify if max object size
func isMaxObjectSize(size string) bool {
i, err := strconv.ParseInt(size, 10, 64)
if err != nil {
return true
}
if i > maxObjectSize {
return true
}
return false
}
// isMinObjectSize - verify if min object size
func isMinObjectSize(size string) bool {
i, err := strconv.ParseInt(size, 10, 64)
if err != nil {
return true
}
if i < minObjectSize {
return true
}
return false
}

Loading…
Cancel
Save