oyd
/
minio
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #692 from harshavardhana/pr_out_isvalidbucket_is_sufficient_we_don_t_need_to_verify_for_

Browse Source
master
Harshavardhana 10 years ago
parent b5a5861c8f f74d6138da
commit c4c67581dc
1 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      pkg/storage/drivers/donut/donut.go

12
pkg/storage/drivers/donut/donut.go
Unescape View File

@ -274,7 +274,7 @@ func (d donutDriver) SetBucketMetadata(bucketName, acl string) error {
if d.donut == nil { if d.donut == nil {
return iodine.New(drivers.InternalError{}, nil) return iodine.New(drivers.InternalError{}, nil)
} }
if !drivers.IsValidBucket(bucketName) || strings.Contains(bucketName, ".") { if !drivers.IsValidBucket(bucketName) {
return iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil) return iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil)
} }
if strings.TrimSpace(acl) == "" { if strings.TrimSpace(acl) == "" {
@ -297,10 +297,10 @@ func (d donutDriver) GetObject(w io.Writer, bucketName, objectName string) (int6
if d.donut == nil { if d.donut == nil {
return 0, iodine.New(drivers.InternalError{}, nil) return 0, iodine.New(drivers.InternalError{}, nil)
} }
if !drivers.IsValidBucket(bucketName) || strings.Contains(bucketName, ".") { if !drivers.IsValidBucket(bucketName) {
return 0, iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil) return 0, iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil)
} }
if !drivers.IsValidObjectName(objectName) || strings.TrimSpace(objectName) == "" { if !drivers.IsValidObjectName(objectName) {
return 0, iodine.New(drivers.ObjectNameInvalid{Object: objectName}, nil) return 0, iodine.New(drivers.ObjectNameInvalid{Object: objectName}, nil)
} }
if _, ok := d.storedBuckets[bucketName]; ok == false { if _, ok := d.storedBuckets[bucketName]; ok == false {
@ -357,10 +357,10 @@ func (d donutDriver) GetPartialObject(w io.Writer, bucketName, objectName string
"start": strconv.FormatInt(start, 10), "start": strconv.FormatInt(start, 10),
"length": strconv.FormatInt(length, 10), "length": strconv.FormatInt(length, 10),
} }
if !drivers.IsValidBucket(bucketName) || strings.Contains(bucketName, ".") { if !drivers.IsValidBucket(bucketName) {
return 0, iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, errParams) return 0, iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, errParams)
} }
if !drivers.IsValidObjectName(objectName) || strings.TrimSpace(objectName) == "" { if !drivers.IsValidObjectName(objectName) {
return 0, iodine.New(drivers.ObjectNameInvalid{Object: objectName}, errParams) return 0, iodine.New(drivers.ObjectNameInvalid{Object: objectName}, errParams)
} }
if start < 0 { if start < 0 {
@ -470,7 +470,7 @@ func (d donutDriver) ListObjects(bucketName string, resources drivers.BucketReso
if d.donut == nil { if d.donut == nil {
return nil, drivers.BucketResourcesMetadata{}, iodine.New(drivers.InternalError{}, errParams) return nil, drivers.BucketResourcesMetadata{}, iodine.New(drivers.InternalError{}, errParams)
} }
if !drivers.IsValidBucket(bucketName) || strings.Contains(bucketName, ".") { if !drivers.IsValidBucket(bucketName) {
return nil, drivers.BucketResourcesMetadata{}, iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil) return nil, drivers.BucketResourcesMetadata{}, iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil)
} }
if !drivers.IsValidObjectName(resources.Prefix) { if !drivers.IsValidObjectName(resources.Prefix) {

Write Preview
Loading…
Cancel
Save