Rename internal errors to s3errors (#803)

close #786

api/auth/center.go

@@ -18,7 +18,7 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	v4 "github.com/nspcc-dev/neofs-s3-gw/api/auth/signer/v4"
 	"github.com/nspcc-dev/neofs-s3-gw/api/cache"
-	apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
 	"github.com/nspcc-dev/neofs-s3-gw/creds/tokens"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
@@ -104,12 +104,12 @@ func New(neoFS tokens.NeoFS, key *keys.PrivateKey, prefixes []string, config *ca
 func (c *center) parseAuthHeader(header string) (*authHeader, error) {
 	submatches := c.reg.GetSubmatches(header)
 	if len(submatches) != authHeaderPartsNum {
-		return nil, apiErrors.GetAPIError(apiErrors.ErrAuthorizationHeaderMalformed)
+		return nil, s3errors.GetAPIError(s3errors.ErrAuthorizationHeaderMalformed)
 	}
 
 	accessKey := strings.Split(submatches["access_key_id"], "0")
 	if len(accessKey) != accessKeyPartsNum {
-		return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidAccessKeyID)
 	}
 
 	signedFields := strings.Split(submatches["signed_header_fields"], ";")
@@ -127,7 +127,7 @@ func (c *center) parseAuthHeader(header string) (*authHeader, error) {
 func (a *authHeader) getAddress() (oid.Address, error) {
 	var addr oid.Address
 	if err := addr.DecodeString(strings.ReplaceAll(a.AccessKeyID, "0", "/")); err != nil {
-		return addr, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
+		return addr, s3errors.GetAPIError(s3errors.ErrInvalidAccessKeyID)
 	}
 	return addr, nil
 }
@@ -219,12 +219,12 @@ func (c center) checkAccessKeyID(accessKeyID string) error {
 		}
 	}
 
-	return apiErrors.GetAPIError(apiErrors.ErrAccessDenied)
+	return s3errors.GetAPIError(s3errors.ErrAccessDenied)
 }
 
 func (c *center) checkFormData(r *http.Request) (*Box, error) {
 	if err := r.ParseMultipartForm(maxFormSizeMemory); err != nil {
-		return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidArgument)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidArgument)
 	}
 
 	if err := prepareForm(r.MultipartForm); err != nil {
@@ -238,7 +238,7 @@ func (c *center) checkFormData(r *http.Request) (*Box, error) {
 
 	submatches := c.postReg.GetSubmatches(MultipartFormValue(r, "x-amz-credential"))
 	if len(submatches) != 4 {
-		return nil, apiErrors.GetAPIError(apiErrors.ErrAuthorizationHeaderMalformed)
+		return nil, s3errors.GetAPIError(s3errors.ErrAuthorizationHeaderMalformed)
 	}
 
 	signatureDateTime, err := time.Parse("20060102T150405Z", MultipartFormValue(r, "x-amz-date"))
@@ -248,7 +248,7 @@ func (c *center) checkFormData(r *http.Request) (*Box, error) {
 
 	var addr oid.Address
 	if err = addr.DecodeString(strings.ReplaceAll(submatches["access_key_id"], "0", "/")); err != nil {
-		return nil, apiErrors.GetAPIError(apiErrors.ErrInvalidAccessKeyID)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidAccessKeyID)
 	}
 
 	box, err := c.cli.GetBox(r.Context(), addr)
@@ -261,7 +261,7 @@ func (c *center) checkFormData(r *http.Request) (*Box, error) {
 
 	signature := signStr(secret, service, region, signatureDateTime, policy)
 	if signature != MultipartFormValue(r, "x-amz-signature") {
-		return nil, apiErrors.GetAPIError(apiErrors.ErrSignatureDoesNotMatch)
+		return nil, s3errors.GetAPIError(s3errors.ErrSignatureDoesNotMatch)
 	}
 
 	return &Box{AccessBox: box}, nil
@@ -296,10 +296,10 @@ func (c *center) checkSign(authHeader *authHeader, box *accessbox.Box, request *
 	if authHeader.IsPresigned {
 		now := time.Now()
 		if signatureDateTime.Add(authHeader.Expiration).Before(now) {
-			return apiErrors.GetAPIError(apiErrors.ErrExpiredPresignRequest)
+			return s3errors.GetAPIError(s3errors.ErrExpiredPresignRequest)
 		}
 		if now.Before(signatureDateTime) {
-			return apiErrors.GetAPIError(apiErrors.ErrBadRequest)
+			return s3errors.GetAPIError(s3errors.ErrBadRequest)
 		}
 		if _, err := signer.Presign(request, nil, authHeader.Service, authHeader.Region, authHeader.Expiration, signatureDateTime); err != nil {
 			return fmt.Errorf("failed to pre-sign temporary HTTP request: %w", err)
@@ -314,7 +314,7 @@ func (c *center) checkSign(authHeader *authHeader, box *accessbox.Box, request *
 	}
 
 	if authHeader.SignatureV4 != signature {
-		return apiErrors.GetAPIError(apiErrors.ErrSignatureDoesNotMatch)
+		return s3errors.GetAPIError(s3errors.ErrSignatureDoesNotMatch)
 	}
 
 	return nil

api/auth/center_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/nspcc-dev/neofs-s3-gw/api/errors"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	"github.com/stretchr/testify/require"
 )
 
@@ -35,12 +35,12 @@ func TestAuthHeaderParse(t *testing.T) {
 		},
 		{
 			header:   strings.ReplaceAll(defaultHeader, "Signature=2811ccb9e242f41426738fb1f", ""),
-			err:      errors.GetAPIError(errors.ErrAuthorizationHeaderMalformed),
+			err:      s3errors.GetAPIError(s3errors.ErrAuthorizationHeaderMalformed),
 			expected: nil,
 		},
 		{
 			header:   strings.ReplaceAll(defaultHeader, "oid0cid", "oidcid"),
-			err:      errors.GetAPIError(errors.ErrInvalidAccessKeyID),
+			err:      s3errors.GetAPIError(s3errors.ErrInvalidAccessKeyID),
 			expected: nil,
 		},
 	} {
@@ -51,7 +51,7 @@ func TestAuthHeaderParse(t *testing.T) {
 }
 
 func TestAuthHeaderGetAddress(t *testing.T) {
-	defaulErr := errors.GetAPIError(errors.ErrInvalidAccessKeyID)
+	defaulErr := s3errors.GetAPIError(s3errors.ErrInvalidAccessKeyID)
 
 	for _, tc := range []struct {
 		authHeader *authHeader

api/handler/acl.go

@@ -18,8 +18,8 @@ import (
 	v2acl "github.com/nspcc-dev/neofs-api-go/v2/acl"
 	"github.com/nspcc-dev/neofs-s3-gw/api"
 	"github.com/nspcc-dev/neofs-s3-gw/api/data"
-	"github.com/nspcc-dev/neofs-s3-gw/api/errors"
 	"github.com/nspcc-dev/neofs-s3-gw/api/layer"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	"github.com/nspcc-dev/neofs-sdk-go/eacl"
 	"github.com/nspcc-dev/neofs-sdk-go/object"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
@@ -221,7 +221,7 @@ func (h *handler) PutBucketACLHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else if err = xml.NewDecoder(r.Body).Decode(list); err != nil {
-		h.logAndSendError(w, "could not parse bucket acl", reqInfo, errors.GetAPIError(errors.ErrMalformedXML))
+		h.logAndSendError(w, "could not parse bucket acl", reqInfo, s3errors.GetAPIError(s3errors.ErrMalformedXML))
 		return
 	}
 
@@ -356,7 +356,7 @@ func (h *handler) PutObjectACLHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else if err = xml.NewDecoder(r.Body).Decode(list); err != nil {
-		h.logAndSendError(w, "could not parse bucket acl", reqInfo, errors.GetAPIError(errors.ErrMalformedXML))
+		h.logAndSendError(w, "could not parse bucket acl", reqInfo, s3errors.GetAPIError(s3errors.ErrMalformedXML))
 		return
 	}
 
@@ -423,7 +423,7 @@ func checkOwner(info *data.BucketInfo, owner string) error {
 
 	// may need to convert owner to appropriate format
 	if info.Owner.String() != owner {
-		return errors.GetAPIError(errors.ErrAccessDenied)
+		return s3errors.GetAPIError(s3errors.ErrAccessDenied)
 	}
 
 	return nil
@@ -543,7 +543,7 @@ func parseGrantee(grantees string) ([]*Grantee, error) {
 	for _, pair := range split {
 		split2 := strings.Split(pair, "=")
 		if len(split2) != 2 {
-			return nil, errors.GetAPIError(errors.ErrInvalidArgument)
+			return nil, s3errors.GetAPIError(s3errors.ErrInvalidArgument)
 		}
 
 		grantee, err := formGrantee(split2[0], split2[1])
@@ -601,7 +601,7 @@ func addPredefinedACP(acp *AccessControlPolicy, cannedACL string) (*AccessContro
 			Permission: awsPermRead,
 		})
 	default:
-		return nil, errors.GetAPIError(errors.ErrInvalidArgument)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidArgument)
 	}
 
 	return acp, nil

api/handler/attributes.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/nspcc-dev/neofs-s3-gw/api"
 	"github.com/nspcc-dev/neofs-s3-gw/api/data"
-	"github.com/nspcc-dev/neofs-s3-gw/api/errors"
 	"github.com/nspcc-dev/neofs-s3-gw/api/layer"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	"go.uber.org/zap"
 )
 
@@ -101,7 +101,7 @@ func (h *handler) GetObjectAttributesHandler(w http.ResponseWriter, r *http.Requ
 	}
 
 	if err = encryptionParams.MatchObjectEncryption(layer.FormEncryptionInfo(info.Headers)); err != nil {
-		h.logAndSendError(w, "encryption doesn't match object", reqInfo, errors.GetAPIError(errors.ErrBadRequest), zap.Error(err))
+		h.logAndSendError(w, "encryption doesn't match object", reqInfo, s3errors.GetAPIError(s3errors.ErrBadRequest), zap.Error(err))
 		return
 	}
 
@@ -148,13 +148,13 @@ func parseGetObjectAttributeArgs(r *http.Request) (*GetObjectAttributesArgs, err
 
 	attributesVal := r.Header.Get(api.AmzObjectAttributes)
 	if attributesVal == "" {
-		return nil, errors.GetAPIError(errors.ErrInvalidAttributeName)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidAttributeName)
 	}
 
 	attributes := strings.Split(attributesVal, ",")
 	for _, a := range attributes {
 		if _, ok := validAttributes[a]; !ok {
-			return nil, errors.GetAPIError(errors.ErrInvalidAttributeName)
+			return nil, s3errors.GetAPIError(s3errors.ErrInvalidAttributeName)
 		}
 		res.Attributes = append(res.Attributes, a)
 	}
@@ -164,13 +164,13 @@ func parseGetObjectAttributeArgs(r *http.Request) (*GetObjectAttributesArgs, err
 	if maxPartsVal == "" {
 		res.MaxParts = layer.MaxSizePartsList
 	} else if res.MaxParts, err = strconv.Atoi(maxPartsVal); err != nil || res.MaxParts < 0 {
-		return nil, errors.GetAPIError(errors.ErrInvalidMaxKeys)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidMaxKeys)
 	}
 
 	markerVal := r.Header.Get(api.AmzPartNumberMarker)
 	if markerVal != "" {
 		if res.PartNumberMarker, err = strconv.Atoi(markerVal); err != nil || res.PartNumberMarker < 0 {
-			return nil, errors.GetAPIError(errors.ErrInvalidPartNumberMarker)
+			return nil, s3errors.GetAPIError(s3errors.ErrInvalidPartNumberMarker)
 		}
 	}
 
@@ -240,7 +240,7 @@ func formUploadAttributes(info *data.ObjectInfo, maxParts, marker int) (*ObjectP
 			}
 		}
 		if !found {
-			return nil, errors.GetAPIError(errors.ErrInvalidPartNumberMarker)
+			return nil, s3errors.GetAPIError(s3errors.ErrInvalidPartNumberMarker)
 		}
 	}
 

api/handler/copy.go

@@ -9,8 +9,8 @@ import (
 	"github.com/nspcc-dev/neofs-s3-gw/api"
 	"github.com/nspcc-dev/neofs-s3-gw/api/auth"
 	"github.com/nspcc-dev/neofs-s3-gw/api/data"
-	"github.com/nspcc-dev/neofs-s3-gw/api/errors"
 	"github.com/nspcc-dev/neofs-s3-gw/api/layer"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	"github.com/nspcc-dev/neofs-sdk-go/session"
 	"go.uber.org/zap"
 )
@@ -32,7 +32,7 @@ var copySourceMatcher = auth.NewRegexpMatcher(regexp.MustCompile(`^/?(?P<bucket_
 func path2BucketObject(path string) (string, string, error) {
 	matches := copySourceMatcher.GetSubmatches(path)
 	if len(matches) != 2 {
-		return "", "", errors.GetAPIError(errors.ErrInvalidRequest)
+		return "", "", s3errors.GetAPIError(s3errors.ErrInvalidRequest)
 	}
 
 	return matches["bucket_name"], matches["object_name"], nil
@@ -111,7 +111,7 @@ func (h *handler) CopyObjectHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if isCopyingToItselfForbidden(reqInfo, srcBucket, srcObject, settings, args) {
-		h.logAndSendError(w, "copying to itself without changing anything", reqInfo, errors.GetAPIError(errors.ErrInvalidCopyDest))
+		h.logAndSendError(w, "copying to itself without changing anything", reqInfo, s3errors.GetAPIError(s3errors.ErrInvalidCopyDest))
 		return
 	}
 
@@ -149,12 +149,12 @@ func (h *handler) CopyObjectHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if err = encryptionParams.MatchObjectEncryption(layer.FormEncryptionInfo(srcObjInfo.Headers)); err != nil {
-		h.logAndSendError(w, "encryption doesn't match object", reqInfo, errors.GetAPIError(errors.ErrBadRequest), zap.Error(err))
+		h.logAndSendError(w, "encryption doesn't match object", reqInfo, s3errors.GetAPIError(s3errors.ErrBadRequest), zap.Error(err))
 		return
 	}
 
 	if err = checkPreconditions(srcObjInfo, args.Conditional); err != nil {
-		h.logAndSendError(w, "precondition failed", reqInfo, errors.GetAPIError(errors.ErrPreconditionFailed))
+		h.logAndSendError(w, "precondition failed", reqInfo, s3errors.GetAPIError(s3errors.ErrPreconditionFailed))
 		return
 	}
 
@@ -288,12 +288,12 @@ func parseCopyObjectArgs(headers http.Header) (*copyObjectArgs, error) {
 
 	copyArgs.MetadataDirective = headers.Get(api.AmzMetadataDirective)
 	if !isValidDirective(copyArgs.MetadataDirective) {
-		return nil, errors.GetAPIError(errors.ErrInvalidMetadataDirective)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidMetadataDirective)
 	}
 
 	copyArgs.TaggingDirective = headers.Get(api.AmzTaggingDirective)
 	if !isValidDirective(copyArgs.TaggingDirective) {
-		return nil, errors.GetAPIError(errors.ErrInvalidTaggingDirective)
+		return nil, s3errors.GetAPIError(s3errors.ErrInvalidTaggingDirective)
 	}
 
 	return copyArgs, nil

api/handler/cors.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/nspcc-dev/neofs-s3-gw/api"
-	"github.com/nspcc-dev/neofs-s3-gw/api/errors"
 	"github.com/nspcc-dev/neofs-s3-gw/api/layer"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	"go.uber.org/zap"
 )
 
@@ -145,12 +145,12 @@ func (h *handler) Preflight(w http.ResponseWriter, r *http.Request) {
 
 	origin := r.Header.Get(api.Origin)
 	if origin == "" {
-		h.logAndSendError(w, "origin request header needed", reqInfo, errors.GetAPIError(errors.ErrBadRequest))
+		h.logAndSendError(w, "origin request header needed", reqInfo, s3errors.GetAPIError(s3errors.ErrBadRequest))
 	}
 
 	method := r.Header.Get(api.AccessControlRequestMethod)
 	if method == "" {
-		h.logAndSendError(w, "Access-Control-Request-Method request header needed", reqInfo, errors.GetAPIError(errors.ErrBadRequest))
+		h.logAndSendError(w, "Access-Control-Request-Method request header needed", reqInfo, s3errors.GetAPIError(s3errors.ErrBadRequest))
 		return
 	}
 
@@ -197,7 +197,7 @@ func (h *handler) Preflight(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	}
-	h.logAndSendError(w, "Forbidden", reqInfo, errors.GetAPIError(errors.ErrAccessDenied))
+	h.logAndSendError(w, "Forbidden", reqInfo, s3errors.GetAPIError(s3errors.ErrAccessDenied))
 }
 
 func checkSubslice(slice []string, subSlice []string) bool {

api/handler/delete.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/nspcc-dev/neofs-s3-gw/api"
 	"github.com/nspcc-dev/neofs-s3-gw/api/data"
-	"github.com/nspcc-dev/neofs-s3-gw/api/errors"
 	"github.com/nspcc-dev/neofs-s3-gw/api/layer"
+	"github.com/nspcc-dev/neofs-s3-gw/api/s3errors"
 	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
 	"github.com/nspcc-dev/neofs-sdk-go/session"
@@ -86,7 +86,7 @@ func (h *handler) DeleteObjectHandler(w http.ResponseWriter, r *http.Request) {
 	deletedObject := deletedObjects[0]
 	if deletedObject.Error != nil {
 		if isErrObjectLocked(deletedObject.Error) {
-			h.logAndSendError(w, "object is locked", reqInfo, errors.GetAPIError(errors.ErrAccessDenied))
+			h.logAndSendError(w, "object is locked", reqInfo, s3errors.GetAPIError(s3errors.ErrAccessDenied))
 		} else {
 			h.logAndSendError(w, "could not delete object", reqInfo, deletedObject.Error)
 		}
@@ -158,21 +158,21 @@ func (h *handler) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *http.Re
 	// Content-Md5 is required and should be set
 	// http://docs.aws.amazon.com/AmazonS3/latest/API/multiobjectdeleteapi.html
 	if _, ok := r.Header[api.ContentMD5]; !ok {
-		h.logAndSendError(w, "missing Content-MD5", reqInfo, errors.GetAPIError(errors.ErrMissingContentMD5))
+		h.logAndSendError(w, "missing Content-MD5", reqInfo, s3errors.GetAPIError(s3errors.ErrMissingContentMD5))
 		return
 	}
 
 	// Content-Length is required and should be non-zero
 	// http://docs.aws.amazon.com/AmazonS3/latest/API/multiobjectdeleteapi.html
 	if r.ContentLength <= 0 {
-		h.logAndSendError(w, "missing Content-Length", reqInfo, errors.GetAPIError(errors.ErrMissingContentLength))
+		h.logAndSendError(w, "missing Content-Length", reqInfo, s3errors.GetAPIError(s3errors.ErrMissingContentLength))
 		return
 	}
 
 	// Unmarshal list of keys to be deleted.
 	requested := &DeleteObjectsRequest{}
 	if err := xml.NewDecoder(r.Body).Decode(requested); err != nil {
-		h.logAndSendError(w, "couldn't decode body", reqInfo, errors.GetAPIError(errors.ErrMalformedXML))
+		h.logAndSendError(w, "couldn't decode body", reqInfo, s3errors.GetAPIError(s3errors.ErrMalformedXML))
 		return
 	}
 
@@ -222,7 +222,7 @@ func (h *handler) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *http.Re
 	for _, obj := range deletedObjects {
 		if obj.Error != nil {
 			code := "BadRequest"
-			if s3err, ok := obj.Error.(errors.Error); ok {
+			if s3err, ok := obj.Error.(s3errors.Error); ok {
 				code = s3err.Code
 			}
 			response.Errors = append(response.Errors, DeleteError{