Bump reva

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

@@ -373,9 +373,10 @@ func (s *svc) UpdateReceivedOCMShare(ctx context.Context, req *ocm.UpdateReceive
 					Status: createRefStatus,
 				}, err
 			case ocm.ShareState_SHARE_STATE_REJECTED:
-				s.removeReference(ctx, req.GetShare().GetShare().ResourceId) // error is logged inside removeReference
-				// FIXME we are ignoring an error from removeReference here
-				return res, nil
+				return &ocm.UpdateReceivedOCMShareResponse{
+					Status: status.NewUnimplemented(ctx, err, "ocm share rejection not supported at the moment"),
+				}, nil
+
 			}
 		case "mount_point":
 			// TODO(labkode): implementing updating mount point

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

@@ -20,7 +20,6 @@ package gateway
 
 import (
 	"context"
-	"path"
 
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1"
@@ -267,97 +266,6 @@ func (s *svc) UpdateReceivedShare(ctx context.Context, req *collaboration.Update
 	*/
 }
 
-func (s *svc) removeReference(ctx context.Context, resourceID *provider.ResourceId) *rpc.Status {
-	log := appctx.GetLogger(ctx)
-
-	idReference := &provider.Reference{ResourceId: resourceID}
-	storageProvider, _, err := s.find(ctx, idReference)
-	if err != nil {
-		appctx.GetLogger(ctx).
-			Err(err).
-			Interface("reference", idReference).
-			Msg("removeReference: failed to get storage provider")
-		if _, ok := err.(errtypes.IsNotFound); ok {
-			return status.NewNotFound(ctx, "storage provider not found")
-		}
-		return status.NewInternal(ctx, "error finding storage provider")
-	}
-
-	statRes, err := storageProvider.Stat(ctx, &provider.StatRequest{Ref: idReference})
-	if err != nil {
-		log.Error().Err(err).Interface("reference", idReference).Msg("removeReference: error calling Stat")
-		return status.NewInternal(ctx, "gateway: error calling Stat for the share resource id: "+resourceID.String())
-	}
-
-	// FIXME how can we delete a reference if the original resource was deleted?
-	if statRes.Status.Code != rpc.Code_CODE_OK {
-		log.Error().Interface("status", statRes.Status).Interface("reference", idReference).Msg("removeReference: error calling Stat")
-		return status.NewInternal(ctx, "could not delete share reference")
-	}
-
-	homeRes, err := s.GetHome(ctx, &provider.GetHomeRequest{})
-	if err != nil {
-		return status.NewInternal(ctx, "could not delete share reference")
-	}
-
-	sharePath := path.Join(homeRes.Path, s.c.ShareFolder, path.Base(statRes.Info.Path))
-	log.Debug().Str("share_path", sharePath).Msg("remove reference of share")
-
-	sharePathRef := &provider.Reference{Path: sharePath}
-	homeProvider, providerInfo, err := s.find(ctx, sharePathRef)
-	if err != nil {
-		appctx.GetLogger(ctx).
-			Err(err).
-			Interface("reference", sharePathRef).
-			Msg("removeReference: failed to get storage provider for share ref")
-		if _, ok := err.(errtypes.IsNotFound); ok {
-			return status.NewNotFound(ctx, "storage provider not found")
-		}
-		return status.NewInternal(ctx, "error finding storage provider")
-	}
-
-	var (
-		root      *provider.ResourceId
-		mountPath string
-	)
-	for _, space := range decodeSpaces(providerInfo) {
-		mountPath = decodePath(space)
-		root = space.Root
-		break // TODO can there be more than one space for a path?
-	}
-
-	ref := unwrap(sharePathRef, mountPath, root)
-
-	deleteReq := &provider.DeleteRequest{
-		Opaque: &typesv1beta1.Opaque{
-			Map: map[string]*typesv1beta1.OpaqueEntry{
-				// This signals the storageprovider that we want to delete the share reference and not the underlying file.
-				"deleting_shared_resource": {},
-			},
-		},
-		Ref: ref,
-	}
-
-	deleteResp, err := homeProvider.Delete(ctx, deleteReq)
-	if err != nil {
-		return status.NewInternal(ctx, "could not delete share reference")
-	}
-
-	switch deleteResp.Status.Code {
-	case rpc.Code_CODE_OK:
-		// we can continue deleting the reference
-	case rpc.Code_CODE_NOT_FOUND:
-		// This is fine, we wanted to delete it anyway
-		return status.NewOK(ctx)
-	default:
-		return status.NewInternal(ctx, "could not delete share reference")
-	}
-
-	log.Debug().Str("share_path", sharePath).Msg("share reference successfully removed")
-
-	return status.NewOK(ctx)
-}
-
 func (s *svc) denyGrant(ctx context.Context, id *provider.ResourceId, g *provider.Grantee, opaque *typesv1beta1.Opaque) (*rpc.Status, error) {
 	ref := &provider.Reference{
 		ResourceId: id,
@@ -676,11 +584,6 @@ func (s *svc) removeShare(ctx context.Context, req *collaboration.RemoveShareReq
 		return nil, errors.Wrap(err, "gateway: error calling RemoveShare")
 	}
 
-	// we do not want to remove the reference if it is a reshare
-	if utils.UserEqual(share.Owner, share.Creator) {
-		s.removeReference(ctx, share.ResourceId)
-	}
-
 	if s.c.CommitShareToStorageGrant {
 		removeGrantStatus, err := s.removeGrant(ctx, share.ResourceId, share.Grantee, share.Permissions.Permissions, nil)
 		if err != nil {

vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -231,6 +231,13 @@ func (h *Handler) CreateShare(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// check that this is a valid share
+	if statRes.Info.Id.OpaqueId == statRes.Info.Id.SpaceId &&
+		(shareType != int(conversions.ShareTypeSpaceMembershipUser) && shareType != int(conversions.ShareTypeSpaceMembershipGroup)) {
+		response.WriteOCSError(w, r, http.StatusBadRequest, "Can not share space root", nil)
+		return
+	}
+
 	// check user has share permissions
 	if !conversions.RoleFromResourcePermissions(statRes.Info.PermissionSet, false).OCSPermissions().Contain(conversions.PermissionShare) {
 		response.WriteOCSError(w, r, http.StatusNotFound, "No share permission", nil)

vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go

@@ -78,6 +78,11 @@ func (h *Handler) getGrantee(ctx context.Context, name string) (provider.Grantee
 func (h *Handler) addSpaceMember(w http.ResponseWriter, r *http.Request, info *provider.ResourceInfo, role *conversions.Role, roleVal []byte) {
 	ctx := r.Context()
 
+	if info.Space.SpaceType == "personal" {
+		response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "can not add members to personal spaces", nil)
+		return
+	}
+
 	shareWith := r.FormValue("shareWith")
 	if shareWith == "" {
 		response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "missing shareWith", nil)

vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload/upload.go

@@ -370,7 +370,7 @@ func (upload *Upload) cleanup(cleanNode, cleanBin, cleanInfo bool) {
 			upload.Node = nil
 		default:
 
-			if err := upload.lu.CopyMetadata(upload.Node.InternalPath(), p, func(attributeName string) bool {
+			if err := upload.lu.CopyMetadata(p, upload.Node.InternalPath(), func(attributeName string) bool {
 				return strings.HasPrefix(attributeName, prefixes.ChecksumPrefix) ||
 					attributeName == prefixes.TypeAttr ||
 					attributeName == prefixes.BlobIDAttr ||