fix: shareCache concurrency panic

fschade · Oct 16, 2024 · 9165b7d · 9165b7d
1 parent 1ae1c24
commit 9165b7d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/changelog/unreleased/fix-sharecache-concurrency-panic.md b/changelog/unreleased/fix-sharecache-concurrency-panic.md
@@ -0,0 +1,5 @@
+Bugfix: Fix ShareCache concurrency panic
+
+We fixed an issue where concurrently read and write operations led to a panic in the ShareCache. 
+
+https://github.com/cs3org/reva/pull/4887
diff --git a/internal/grpc/services/usershareprovider/usershareprovider.go b/internal/grpc/services/usershareprovider/usershareprovider.go
@@ -535,16 +535,21 @@ func (s *service) UpdateReceivedShare(ctx context.Context, req *collaboration.Up
 	var uid userpb.UserId
 	_ = utils.ReadJSONFromOpaque(req.Opaque, "userid", &uid)
 	updatedShare, err := s.sm.UpdateReceivedShare(ctx, req.Share, req.UpdateMask, &uid)
-	if err != nil {
+	switch err.(type) {
+	case nil:
+		return &collaboration.UpdateReceivedShareResponse{
+			Status: status.NewOK(ctx),
+			Share:  updatedShare,
+		}, nil
+	case errtypes.NotFound:
 		return &collaboration.UpdateReceivedShareResponse{
-			Status: status.NewInternal(ctx, "error updating received share"),
+			Status: status.NewNotFound(ctx, "error getting received share"),
+		}, nil
+	default:
+		return &collaboration.UpdateReceivedShareResponse{
+			Status: status.NewInternal(ctx, "error getting received share"),
 		}, nil
 	}
-
-	return &collaboration.UpdateReceivedShareResponse{
-		Status: status.NewOK(ctx),
-		Share:  updatedShare,
-	}, nil
 }
 
 func setReceivedShareMountPoint(ctx context.Context, gwc gateway.GatewayAPIClient, req *collaboration.UpdateReceivedShareRequest) (*rpc.Status, error) {

diff --git a/pkg/share/manager/jsoncs3/sharecache/sharecache.go b/pkg/share/manager/jsoncs3/sharecache/sharecache.go
@@ -28,13 +28,15 @@ import (
 	"sync"
 	"time"
 
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"golang.org/x/exp/maps"
+
 	"github.com/cs3org/reva/v2/pkg/appctx"
 	"github.com/cs3org/reva/v2/pkg/errtypes"
 	"github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3/shareid"
 	"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mtimesyncedcache"
 	"github.com/cs3org/reva/v2/pkg/storage/utils/metadata"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/codes"
 )
 
 // name is the Tracer name used to identify this instrumentation library.
@@ -246,7 +248,7 @@ func (c *Cache) List(ctx context.Context, userid string) (map[string]SpaceShareI
 
 	for ssid, cached := range us.UserShares {
 		r[ssid] = SpaceShareIDs{
-			IDs: cached.IDs,
+			IDs: maps.Clone(cached.IDs),
 		}
 	}
 	return r, nil