mirror of
https://github.com/minio/minio.git
synced 2024-12-28 08:05:55 -05:00
cd3eb63c4a
This commit improves the docs for both functions (more Go-like) and drops an unnecessary condition in IsValidBucketName. This also drops a condition in IsValidObjectName where "" (empty string) was a valid object name. This has been fixed and will no longer return true. This commit also adds tests for both functions, including a regression test for the bug fix.
54 lines
1.7 KiB
Go
54 lines
1.7 KiB
Go
/*
|
|
* Minio Cloud Storage, (C) 2015, 2016 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 fs
|
|
|
|
import (
|
|
"regexp"
|
|
"unicode/utf8"
|
|
)
|
|
|
|
// validBucket regexp.
|
|
var validBucket = regexp.MustCompile(`^[a-z0-9][a-z0-9\.\-]{1,61}[a-z0-9]$`)
|
|
|
|
// IsValidBucketName verifies a bucket name in accordance with Amazon's
|
|
// requirements. It must be 3-63 characters long, can contain dashes
|
|
// and periods, but must begin and end with a lowercase letter or a number.
|
|
// See: http://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html
|
|
func IsValidBucketName(bucket string) bool {
|
|
if len(bucket) < 3 || len(bucket) > 63 {
|
|
return false
|
|
}
|
|
if bucket[0] == '.' || bucket[len(bucket)-1] == '.' {
|
|
return false
|
|
}
|
|
return validBucket.MatchString(bucket)
|
|
}
|
|
|
|
// IsValidObjectName verifies an object name in accordance with Amazon's
|
|
// requirements. It cannot exceed 1024 characters and must be a valid UTF8
|
|
// string.
|
|
// See: http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
|
|
func IsValidObjectName(object string) bool {
|
|
if len(object) > 1024 || len(object) == 0 {
|
|
return false
|
|
}
|
|
if !utf8.ValidString(object) {
|
|
return false
|
|
}
|
|
return true
|
|
}
|