mirror of
https://github.com/pgsty/minio.git
synced 2026-07-19 12:10:24 +03:00
Vendorize with bug fixes from minio browser. (#3341)
This patch brings in changes from miniobrowser repo. - Bucket policy UI and functionality fixes by @krishnasrinivas - Bucket policy implementation by @balamurugana - UI changes and new functionality changing password etc. @rushenn - UI and new functionality for sharing URLs, deleting files @rushenn and @krishnasrinivas. - Other misc fixes by @vadmeste @brendanashworth
This commit is contained in:
+14
-2
@@ -696,13 +696,19 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
|
||||
err = parseBucketPolicy(bytes.NewReader(data), policy)
|
||||
if err != nil {
|
||||
errorIf(err, "Unable to parse bucket policy.")
|
||||
return toJSONError(err)
|
||||
return toJSONError(err, args.BucketName)
|
||||
}
|
||||
|
||||
// Parse check bucket policy.
|
||||
if s3Error := checkBucketPolicyResources(args.BucketName, policy); s3Error != ErrNone {
|
||||
apiErr := getAPIError(s3Error)
|
||||
return toJSONError(errors.New(apiErr.Description), args.BucketName)
|
||||
var err error
|
||||
if apiErr.Code == "XMinioPolicyNesting" {
|
||||
err = PolicyNesting{}
|
||||
} else {
|
||||
err = errors.New(apiErr.Description)
|
||||
}
|
||||
return toJSONError(err, args.BucketName)
|
||||
}
|
||||
|
||||
// TODO: update policy statements according to bucket name,
|
||||
@@ -850,6 +856,8 @@ func toWebAPIError(err error) APIError {
|
||||
apiErrCode = ErrStorageFull
|
||||
case BucketNotFound:
|
||||
apiErrCode = ErrNoSuchBucket
|
||||
case BucketExists:
|
||||
apiErrCode = ErrBucketAlreadyOwnedByYou
|
||||
case BucketNameInvalid:
|
||||
apiErrCode = ErrInvalidBucketName
|
||||
case BadDigest:
|
||||
@@ -866,7 +874,11 @@ func toWebAPIError(err error) APIError {
|
||||
apiErrCode = ErrWriteQuorum
|
||||
case InsufficientReadQuorum:
|
||||
apiErrCode = ErrReadQuorum
|
||||
case PolicyNesting:
|
||||
apiErrCode = ErrPolicyNesting
|
||||
default:
|
||||
// Log unexpected and unhandled errors.
|
||||
errorIf(err, errUnexpected.Error())
|
||||
apiErrCode = ErrInternalError
|
||||
}
|
||||
apiErr := getAPIError(apiErrCode)
|
||||
|
||||
Reference in New Issue
Block a user