show mounted shares in virtual share jail root

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> populate share jail Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · May 19, 2022 · cee3342 · cee3342
1 parent 51d4c29
commit cee3342
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 3 deletions.
diff --git a/changelog/unreleased/populate-share-jail.md b/changelog/unreleased/populate-share-jail.md
@@ -0,0 +1,6 @@
+Enhancement: show mounted shares in virtual share jail root
+
+The virtual share jail now shows the mounted shares to allow the desktop client to sync that collection.
+
+https://github.com/cs3org/reva/pull/2884
+https://github.com/owncloud/ocis/issues/3719
diff --git a/internal/grpc/services/gateway/usershareprovider.go b/internal/grpc/services/gateway/usershareprovider.go
@@ -170,6 +170,7 @@ func (s *svc) ListReceivedShares(ctx context.Context, req *collaboration.ListRec
 	// The `ListStorageSpaces` method in sharesstorageprovider/sharesstorageprovider.go needs the etags.
 	shareMetaData := make(map[string]share.Metadata, len(res.Shares))
 	for _, rs := range res.Shares {
+		// Stat .. here, only for etag and mtime? and then we throw the rest away?
 		sRes, err := s.Stat(ctx, &provider.StatRequest{Ref: &provider.Reference{ResourceId: rs.Share.ResourceId}})
 		if err != nil {
 			logger.Error().

diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -382,8 +382,10 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora
 			if spaceID == nil || utils.ResourceIDEqual(virtualRootID, spaceID) {
 				earliestShare, atLeastOneAccepted := findEarliestShare(receivedShares, shareMd)
 				var opaque *typesv1beta1.Opaque
+				var mtime *typesv1beta1.Timestamp
 				if earliestShare != nil {
 					if md, ok := shareMd[earliestShare.Id.OpaqueId]; ok {
+						mtime = md.Mtime
 						opaque = utils.AppendPlainToOpaque(opaque, "etag", md.ETag)
 					}
 				}
@@ -398,8 +400,9 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora
 						SpaceType: "virtual",
 						//Owner:     &userv1beta1.User{Id: receivedShare.Share.Owner}, // FIXME actually, the mount point belongs to the recipient
 						// the sharesstorageprovider keeps track of mount points
-						Root: virtualRootID,
-						Name: "Shares Jail",
+						Root:  virtualRootID,
+						Name:  "Shares Jail",
+						Mtime: mtime,
 					}
 					res.StorageSpaces = append(res.StorageSpaces, space)
 				}
@@ -761,9 +764,55 @@ func (s *service) ListContainer(ctx context.Context, req *provider.ListContainer
 
 	if isVirtualRoot(req.Ref.ResourceId) {
 		// The root is empty, it is filled by mountpoints
+		// but when accessing the root via /dav/spaces we need to list the content
+
+		receivedShares, _, err := s.fetchShares(ctx)
+		if err != nil {
+			return nil, errors.Wrap(err, "sharesstorageprovider: error calling ListReceivedSharesRequest")
+		}
+
+		infos := []*provider.ResourceInfo{}
+		for _, share := range receivedShares {
+			if share.GetState() != collaboration.ShareState_SHARE_STATE_ACCEPTED {
+				continue
+			}
+
+			statRes, err := s.gateway.Stat(ctx, &provider.StatRequest{
+				Opaque: req.Opaque,
+				Ref: &provider.Reference{
+					ResourceId: share.Share.ResourceId,
+					// Path: "." TODO force a relative request? should not matter because we always only want the name
+				},
+				ArbitraryMetadataKeys: req.ArbitraryMetadataKeys,
+			})
+			switch {
+			case err != nil:
+				appctx.GetLogger(ctx).Error().
+					Err(err).
+					Interface("share", share).
+					Msg("sharesstorageprovider: could not make stat request when listing virtual root, skipping")
+				continue
+			case statRes.Status.Code != rpc.Code_CODE_OK:
+				appctx.GetLogger(ctx).Debug().
+					Interface("share", share).
+					Interface("status", statRes.Status).
+					Msg("sharesstorageprovider: could not stat share when listing virtual root, skipping")
+				continue
+			}
+
+			// override info
+			info := statRes.Info
+			info.Id = &provider.ResourceId{
+				StorageId: utils.ShareStorageProviderID,
+				OpaqueId:  share.Share.Id.OpaqueId,
+			}
+			info.Path = filepath.Base(share.MountPoint.Path)
+
+			infos = append(infos, info)
+		}
 		return &provider.ListContainerResponse{
 			Status: status.NewOK(ctx),
-			Infos:  []*provider.ResourceInfo{},
+			Infos:  infos,
 		}, nil
 	}
 	receivedShare, rpcStatus, err := s.resolveReference(ctx, req.Ref)