Check cache usage

api/handler/put.go

@@ -25,6 +25,7 @@ import (
 	"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/internal/models"
+	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
 	"github.com/nspcc-dev/neofs-sdk-go/eacl"
 	"github.com/nspcc-dev/neofs-sdk-go/session"
 	"go.uber.org/zap"
@@ -288,6 +289,11 @@ func (h *handler) PutObjectHandler(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		_, err2 := io.Copy(io.Discard, r.Body)
 		err3 := r.Body.Close()
+		if errors.Is(err, apistatus.ErrObjectAccessDenied) {
+			h.logAndSendError(w, "could not upload object", reqInfo, s3errors.GetAPIError(s3errors.ErrAccessDenied), zap.Error(err))
+			return
+		}
+
 		h.logAndSendError(w, "could not upload object", reqInfo, err, zap.Errors("body close errors", []error{err2, err3}))
 		return
 	}

api/layer/cache.go

@@ -187,25 +187,17 @@ func (c *Cache) PutLockInfo(owner user.ID, key string, lockInfo *data.LockInfo)
 	}
 }
 
-func (c *Cache) GetSettings(owner user.ID, bktInfo *data.BucketInfo) *data.BucketSettings {
+func (c *Cache) GetSettings(bktInfo *data.BucketInfo) *data.BucketSettings {
 	key := bktInfo.Name + bktInfo.SettingsObjectName()
 
-	if !c.accessCache.Get(owner, key) {
-		return nil
-	}
-
 	return c.systemCache.GetSettings(key)
 }
 
-func (c *Cache) PutSettings(owner user.ID, bktInfo *data.BucketInfo, settings *data.BucketSettings) {
+func (c *Cache) PutSettings(bktInfo *data.BucketInfo, settings *data.BucketSettings) {
 	key := bktInfo.Name + bktInfo.SettingsObjectName()
 	if err := c.systemCache.PutSettings(key, settings); err != nil {
 		c.logger.Warn("couldn't cache bucket settings", zap.String("bucket", bktInfo.Name), zap.Error(err))
 	}
-
-	if err := c.accessCache.Put(owner, key); err != nil {
-		c.logger.Warn("couldn't cache access control operation", zap.Error(err))
-	}
 }
 
 func (c *Cache) GetCORS(owner user.ID, bkt *data.BucketInfo) *data.CORSConfiguration {

api/layer/notifications.go

@@ -45,6 +45,11 @@ func (n *layer) PutBucketNotificationConfiguration(ctx context.Context, p *PutBu
 }
 
 func (n *layer) GetBucketNotificationConfiguration(ctx context.Context, bktInfo *data.BucketInfo) (*data.NotificationConfiguration, error) {
+	owner := n.Owner(ctx)
+	if conf := n.cache.GetNotificationConfiguration(owner, bktInfo); conf != nil {
+		return conf, nil
+	}
+
 	var (
 		err  error
 		conf data.NotificationConfiguration

api/layer/system_object.go

@@ -275,8 +275,7 @@ func lockObjectKey(objVersion *ObjectVersion) string {
 }
 
 func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo) (*data.BucketSettings, error) {
-	owner := n.Owner(ctx)
-	if settings := n.cache.GetSettings(owner, bktInfo); settings != nil {
+	if settings := n.cache.GetSettings(bktInfo); settings != nil {
 		return settings, nil
 	}
 
@@ -291,6 +290,8 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
 	}
 
 	if id.IsZero() {
+		n.cache.PutSettings(bktInfo, &settings)
+
 		return &settings, nil
 	}
 
@@ -316,7 +317,7 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
 
 	settings.LockConfiguration = &olc
 
-	n.cache.PutSettings(owner, bktInfo, &settings)
+	n.cache.PutSettings(bktInfo, &settings)
 
 	return &settings, nil
 }
@@ -344,7 +345,7 @@ func (n *layer) PutBucketSettings(ctx context.Context, p *PutSettingsParams) err
 		return fmt.Errorf("create bucket settings object: %w", err)
 	}
 
-	n.cache.PutSettings(n.Owner(ctx), p.BktInfo, p.Settings)
+	n.cache.PutSettings(p.BktInfo, p.Settings)
 
 	return nil
 }

api/layer/tagging.go

@@ -233,6 +233,10 @@ func (n *layer) GetBucketTagging(ctx context.Context, bktInfo *data.BucketInfo)
 		owner = n.Owner(ctx)
 	)
 
+	if tags := n.cache.GetTagging(owner, bucketTaggingCacheKey(bktInfo.CID)); tags != nil {
+		return tags, nil
+	}
+
 	id, err := n.searchBucketMetaObjects(ctx, bktInfo, s3headers.TypeBucketTags)
 	if err != nil {
 		return nil, fmt.Errorf("search: %w", err)