Add more friendly error message for policy object

cmd/api-errors.go

@@ -65,6 +65,7 @@ const (
 	ErrBadDigest
 	ErrEntityTooSmall
 	ErrEntityTooLarge
+	ErrPolicyTooLarge
 	ErrIncompleteBody
 	ErrInternalError
 	ErrInvalidAccessKeyID
@@ -399,6 +400,11 @@ var errorCodes = errorCodeMap{
 		Description:    "Your proposed upload exceeds the maximum allowed object size.",
 		HTTPStatusCode: http.StatusBadRequest,
 	},
+	ErrPolicyTooLarge: {
+		Code:           "PolicyTooLare",
+		Description:    "Policy object exceeds the maximum allowed object size.",
+		HTTPStatusCode: http.StatusBadRequest,
+	},
 	ErrIncompleteBody: {
 		Code:           "IncompleteBody",
 		Description:    "You did not provide the number of bytes specified by the Content-Length HTTP header.",
@@ -1500,6 +1506,8 @@ func toAPIErrorCode(ctx context.Context, err error) (apiErr APIErrorCode) {
 		apiErr = ErrInvalidRange
 	case errDataTooLarge:
 		apiErr = ErrEntityTooLarge
+	case errPolicyTooLarge:
+		apiErr = ErrPolicyTooLarge
 	case errDataTooSmall:
 		apiErr = ErrEntityTooSmall
 	case auth.ErrInvalidAccessKeyLength:

cmd/bucket-policy-handlers.go

@@ -71,7 +71,7 @@ func (api objectAPIHandlers) PutBucketPolicyHandler(w http.ResponseWriter, r *ht
 
 	// Error out if Content-Length is beyond allowed size.
 	if r.ContentLength > maxBucketPolicySize {
-		writeErrorResponse(ctx, w, errorCodes.ToAPIErr(ErrEntityTooLarge), r.URL, guessIsBrowserReq(r))
+		writeErrorResponse(ctx, w, errorCodes.ToAPIErr(ErrPolicyTooLarge), r.URL, guessIsBrowserReq(r))
 		return
 	}
 

cmd/object-api-errors.go

@@ -76,7 +76,7 @@ func toObjectErr(err error, params ...string) error {
 				Object: params[1],
 			}
 		}
-	case errDataTooLarge:
+	case errDataTooLarge,errPolicyTooLarge:
 		if len(params) >= 2 {
 			err = ObjectTooLarge{
 				Bucket: params[0],

cmd/typed-errors.go

@@ -38,6 +38,9 @@ var errSizeUnspecified = errors.New("Data size is unspecified")
 // When upload object size is greater than 5G in a single PUT/POST operation.
 var errDataTooLarge = errors.New("Object size larger than allowed limit")
 
+// When policy object size is greater than 20K
+var errPolicyTooLarge = errors.New("Policy object size larger than allowed limit")
+
 // When upload object size is less than what was expected.
 var errDataTooSmall = errors.New("Object size smaller than expected")