feat(reva): bump reva

Signed-off-by: jkoberg <jkoberg@owncloud.com>

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.10.0
 	github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
-	github.com/cs3org/reva/v2 v2.19.2-0.20240416121921-56d2be7011cf
+	github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
 	github.com/disintegration/imaging v1.6.2
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

go.sum

@@ -1022,8 +1022,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.19.2-0.20240416121921-56d2be7011cf h1:RSuahP/PhMCVB/SHCkiXolJ8xGvGKjkhINcda21A+gY=
-github.com/cs3org/reva/v2 v2.19.2-0.20240416121921-56d2be7011cf/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
+github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf h1:MCXXZKR3fj2ZCaEPQ3l3cpR4q/TmVaaPbgKUB2hhCvo=
+github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

vendor/github.com/cs3org/reva/v2/internal/grpc/interceptors/eventsmiddleware/conversion.go

@@ -179,11 +179,14 @@ func LinkAccessFailed(r *link.GetPublicShareByTokenResponse, req *link.GetPublic
 
 // LinkRemoved converts the response to an event
 func LinkRemoved(r *link.RemovePublicShareResponse, req *link.RemovePublicShareRequest, executant *user.UserId) events.LinkRemoved {
+	var rid *provider.ResourceId
+	_ = utils.ReadJSONFromOpaque(r.Opaque, "resourceid", &rid)
 	return events.LinkRemoved{
 		Executant:  executant,
 		ShareID:    req.Ref.GetId(),
 		ShareToken: req.Ref.GetToken(),
 		Timestamp:  utils.TSNow(),
+		ItemID:     rid,
 	}
 }
 

vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/storageprovider.go

@@ -250,14 +250,14 @@ func (s *svc) ListStorageSpaces(ctx context.Context, req *provider.ListStorageSp
 	for _, f := range req.Filters {
 		switch f.Type {
 		case provider.ListStorageSpacesRequest_Filter_TYPE_ID:
-			sid, spid, oid, err := storagespace.SplitID(f.GetId().OpaqueId)
+			sid, spid, oid, err := storagespace.SplitID(f.GetId().GetOpaqueId())
 			if err != nil {
 				continue
 			}
 			filters["storage_id"], filters["space_id"], filters["opaque_id"] = sid, spid, oid
 		case provider.ListStorageSpacesRequest_Filter_TYPE_OWNER:
-			filters["owner_idp"] = f.GetOwner().Idp
-			filters["owner_id"] = f.GetOwner().OpaqueId
+			filters["owner_idp"] = f.GetOwner().GetIdp()
+			filters["owner_id"] = f.GetOwner().GetOpaqueId()
 		case provider.ListStorageSpacesRequest_Filter_TYPE_SPACE_TYPE:
 			filters["space_type"] = f.GetSpaceType()
 		case provider.ListStorageSpacesRequest_Filter_TYPE_USER:
@@ -339,7 +339,7 @@ func (s *svc) DeleteStorageSpace(ctx context.Context, req *provider.DeleteStorag
 		_, purge = opaque.Map["purge"]
 	}
 
-	rid, err := storagespace.ParseID(req.Id.OpaqueId)
+	rid, err := storagespace.ParseID(req.GetId().GetOpaqueId())
 	if err != nil {
 		return &provider.DeleteStorageSpaceResponse{
 			Status: status.NewStatusFromErrType(ctx, fmt.Sprintf("gateway could not parse space id %s", req.GetId().GetOpaqueId()), err),
@@ -361,7 +361,7 @@ func (s *svc) DeleteStorageSpace(ctx context.Context, req *provider.DeleteStorag
 		}, nil
 	}
 
-	id := &provider.ResourceId{OpaqueId: req.Id.OpaqueId}
+	id := &provider.ResourceId{OpaqueId: req.GetId().GetOpaqueId()}
 	s.providerCache.RemoveListStorageProviders(id)
 
 	if dsRes.Status.Code != rpc.Code_CODE_OK {
@@ -1221,11 +1221,11 @@ func unwrap(ref *provider.Reference, mountPoint string, root *provider.ResourceI
 
 	return &provider.Reference{
 		ResourceId: &provider.ResourceId{
-			StorageId: ref.ResourceId.StorageId,
-			SpaceId:   ref.ResourceId.SpaceId,
-			OpaqueId:  ref.ResourceId.OpaqueId,
+			StorageId: ref.GetResourceId().GetStorageId(),
+			SpaceId:   ref.GetResourceId().GetSpaceId(),
+			OpaqueId:  ref.GetResourceId().GetOpaqueId(),
 		},
-		Path: ref.Path,
+		Path: ref.GetPath(),
 	}
 }
 

vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/usershareprovider.go

@@ -45,9 +45,9 @@ func (s *svc) CreateShare(ctx context.Context, req *collaboration.CreateShareReq
 }
 
 func (s *svc) RemoveShare(ctx context.Context, req *collaboration.RemoveShareRequest) (*collaboration.RemoveShareResponse, error) {
-	key := req.Ref.GetKey()
+	key := req.GetRef().GetKey()
 	if !s.c.UseCommonSpaceRootShareLogic && shareIsSpaceRoot(key) {
-		return s.removeSpaceShare(ctx, key.ResourceId, key.Grantee)
+		return s.removeSpaceShare(ctx, key.GetResourceId(), key.GetGrantee())
 	}
 	return s.removeShare(ctx, req)
 }
@@ -149,7 +149,7 @@ func (s *svc) updateShare(ctx context.Context, req *collaboration.UpdateShareReq
 		if updateGrantStatus.Code != rpc.Code_CODE_OK {
 			return &collaboration.UpdateShareResponse{
 				Status: updateGrantStatus,
-				Share:  res.Share,
+				Share:  res.GetShare(),
 			}, nil
 		}
 	}
@@ -835,11 +835,11 @@ func isEqualGrantee(a, b *provider.Grantee) bool {
 	var aID, bID string
 	switch a.Type {
 	case provider.GranteeType_GRANTEE_TYPE_GROUP:
-		aID = a.GetGroupId().OpaqueId
-		bID = b.GetGroupId().OpaqueId
+		aID = a.GetGroupId().GetOpaqueId()
+		bID = b.GetGroupId().GetOpaqueId()
 	case provider.GranteeType_GRANTEE_TYPE_USER:
-		aID = a.GetUserId().OpaqueId
-		bID = b.GetUserId().OpaqueId
+		aID = a.GetUserId().GetOpaqueId()
+		bID = b.GetUserId().GetOpaqueId()
 	}
 	return aID == bID
 }

vendor/github.com/cs3org/reva/v2/internal/grpc/services/publicshareprovider/publicshareprovider.go

@@ -372,6 +372,7 @@ func (s *service) RemovePublicShare(ctx context.Context, req *link.RemovePublicS
 		}, err
 	}
 	return &link.RemovePublicShareResponse{
+		Opaque: utils.AppendJSONToOpaque(nil, "resourceid", ps.GetResourceId()),
 		Status: status.NewOK(ctx),
 	}, nil
 }

vendor/github.com/cs3org/reva/v2/pkg/events/sharing.go

@@ -223,6 +223,7 @@ type LinkRemoved struct {
 	ShareID    *link.PublicShareId
 	ShareToken string
 	Timestamp  *types.Timestamp
+	ItemID     *provider.ResourceId
 }
 
 // Unmarshal to fulfill umarshaller interface

vendor/modules.txt

@@ -366,7 +366,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
 github.com/cs3org/go-cs3apis/cs3/types/v1beta1
-# github.com/cs3org/reva/v2 v2.19.2-0.20240416121921-56d2be7011cf
+# github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf
 ## explicit; go 1.21
 github.com/cs3org/reva/v2/cmd/revad/internal/grace
 github.com/cs3org/reva/v2/cmd/revad/runtime