From fc74e9b40cdc46ce0d977bc05af57d1bd6d56ff1 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Mon, 28 Sep 2020 19:45:56 +0300 Subject: [PATCH] [#32] Remove recover from basic ACL checks Basic ACL checker gets request field via getters that are NPE-free, therefore we don't need to worry about function invocations on nil structures. Signed-off-by: Alex Vanin --- pkg/services/object/acl/basic.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkg/services/object/acl/basic.go b/pkg/services/object/acl/basic.go index bf7658862..ba1906148 100644 --- a/pkg/services/object/acl/basic.go +++ b/pkg/services/object/acl/basic.go @@ -297,13 +297,6 @@ func (b BasicChecker) findRequestInfo( } func getContainerIDFromRequest(req interface{}) (id *container.ID, err error) { - defer func() { - // if there is a NPE on get body and get address - if r := recover(); r != nil { - err = ErrMalformedRequest - } - }() - switch v := req.(type) { case *object.GetRequest: return container.NewIDFromV2(v.GetBody().GetAddress().GetContainerID()), nil @@ -330,13 +323,6 @@ func getContainerIDFromRequest(req interface{}) (id *container.ID, err error) { } func getObjectOwnerFromMessage(req interface{}) (id *owner.ID, err error) { - defer func() { - // if there is a NPE on get body and get address - if r := recover(); r != nil { - err = ErrMalformedRequest - } - }() - switch v := req.(type) { case *object.PutRequest: objPart := v.GetBody().GetObjectPart()