mirror of
				https://github.com/minio/minio.git
				synced 2025-10-29 15:55:00 -04:00 
			
		
		
		
	
							parent
							
								
									7290d23b26
								
							
						
					
					
						commit
						7e3ea77fdf
					
				| @ -92,3 +92,6 @@ var errIAMActionNotAllowed = errors.New("Specified IAM action is not allowed und | |||||||
| 
 | 
 | ||||||
| // error returned when access is denied. | // error returned when access is denied. | ||||||
| var errAccessDenied = errors.New("Do not have enough permissions to access this resource") | var errAccessDenied = errors.New("Do not have enough permissions to access this resource") | ||||||
|  | 
 | ||||||
|  | // error returned when object is locked. | ||||||
|  | var errLockedObject = errors.New("Object is WORM protected and cannot be overwritten or deleted") | ||||||
|  | |||||||
| @ -719,6 +719,9 @@ next: | |||||||
| 			} | 			} | ||||||
| 
 | 
 | ||||||
| 			apiErr := enforceRetentionBypassForDeleteWeb(ctx, r, args.BucketName, objectName, getObjectInfo, govBypassPerms) | 			apiErr := enforceRetentionBypassForDeleteWeb(ctx, r, args.BucketName, objectName, getObjectInfo, govBypassPerms) | ||||||
|  | 			if apiErr == ErrObjectLocked { | ||||||
|  | 				return toJSONError(ctx, errLockedObject) | ||||||
|  | 			} | ||||||
| 			if apiErr != ErrNone && apiErr != ErrNoSuchKey { | 			if apiErr != ErrNone && apiErr != ErrNoSuchKey { | ||||||
| 				return toJSONError(ctx, errAccessDenied) | 				return toJSONError(ctx, errAccessDenied) | ||||||
| 			} | 			} | ||||||
| @ -2140,7 +2143,7 @@ func toWebAPIError(ctx context.Context, err error) APIError { | |||||||
| 			Description:    err.Error(), | 			Description:    err.Error(), | ||||||
| 		} | 		} | ||||||
| 	case errAuthentication, auth.ErrInvalidAccessKeyLength, | 	case errAuthentication, auth.ErrInvalidAccessKeyLength, | ||||||
| 		auth.ErrInvalidSecretKeyLength, errInvalidAccessKeyID: | 		auth.ErrInvalidSecretKeyLength, errInvalidAccessKeyID, errAccessDenied, errLockedObject: | ||||||
| 		return APIError{ | 		return APIError{ | ||||||
| 			Code:           "AccessDenied", | 			Code:           "AccessDenied", | ||||||
| 			HTTPStatusCode: http.StatusForbidden, | 			HTTPStatusCode: http.StatusForbidden, | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user