MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-26 13:02:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove policy nesting errors (#7449)

Browse Source 
Policy nesting has been supported for a while
now, we should remove references of code and
docs indicating nesting is not allowed anymore.
This commit is contained in:
Harshavardhana 2019-03-31 08:42:43 -07:00 committed by GitHub
parent dd1d69ab5c
commit 619611933a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/api-errors.go
View File

@ -184,7 +184,6 @@ const (
ErrStorageFull ErrStorageFull
ErrRequestBodyParse ErrRequestBodyParse
ErrObjectExistsAsDirectory ErrObjectExistsAsDirectory
ErrPolicyNesting
ErrInvalidObjectName ErrInvalidObjectName
ErrInvalidResourceName ErrInvalidResourceName
ErrServerNotInitialized ErrServerNotInitialized
@ -884,11 +883,6 @@ var errorCodes = errorCodeMap{
Description: "Multiple disks failures, unable to write data.", Description: "Multiple disks failures, unable to write data.",
HTTPStatusCode: http.StatusServiceUnavailable, HTTPStatusCode: http.StatusServiceUnavailable,
}, },
ErrPolicyNesting: {
Code: "XMinioPolicyNesting",
Description: "New bucket policy conflicts with an existing policy. Please try again with new prefix.",
HTTPStatusCode: http.StatusConflict,
},
ErrInvalidObjectName: { ErrInvalidObjectName: {
Code: "XMinioInvalidObjectName", Code: "XMinioInvalidObjectName",
Description: "Object name contains unsupported characters.", Description: "Object name contains unsupported characters.",

7
cmd/object-api-errors.go
View File

@ -372,13 +372,6 @@ func (e NotImplemented) Error() string {
return "Not Implemented" return "Not Implemented"
} }
// PolicyNesting - policy nesting conflict.
type PolicyNesting struct{}
func (e PolicyNesting) Error() string {
return "New bucket policy conflicts with an existing policy. Please try again with new prefix."
}
// UnsupportedMetadata - unsupported metadata // UnsupportedMetadata - unsupported metadata
type UnsupportedMetadata struct{} type UnsupportedMetadata struct{}

2
cmd/web-handlers.go
View File

@ -1840,8 +1840,6 @@ func toWebAPIError(err error) APIError {
return getAPIError(ErrWriteQuorum) return getAPIError(ErrWriteQuorum)
case InsufficientReadQuorum: case InsufficientReadQuorum:
return getAPIError(ErrReadQuorum) return getAPIError(ErrReadQuorum)
case PolicyNesting:
return getAPIError(ErrPolicyNesting)
case NotImplemented: case NotImplemented:
return APIError{ return APIError{
Code: "NotImplemented", Code: "NotImplemented",

39
docs/bucket/policy/README.md
View File

@ -1,39 +0,0 @@
## Access Policy
This package implements parsing and validating bucket access policies based on Access Policy Language specification - http://docs.aws.amazon.com/AmazonS3/latest/dev/access-policy-language-overview.html
### Supports following effects.
Allow
Deny
### Supports following set of operations.
s3:GetObject
s3:ListBucket
s3:PutObject
s3:GetBucketLocation
s3:DeleteObject
s3:AbortMultipartUpload
s3:ListBucketMultipartUploads
s3:ListMultipartUploadParts
### Supports following conditions.
StringEquals
StringNotEquals
StringLike
StringNotLike
IpAddress
NotIpAddress
Supported applicable condition keys for each conditions.
s3:prefix
s3:max-keys
aws:Referer
aws:SourceIp
### Nested policy support.
Nested policies are not allowed.