bump reva 2.28

vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/trashbin/trashbin.go

@@ -26,13 +26,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
 
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
+	"github.com/opencloud-eu/reva/v2/pkg/errtypes"
 	"github.com/opencloud-eu/reva/v2/pkg/storage"
 	"github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/lookup"
 	"github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/options"
@@ -145,7 +145,7 @@ func trashRootForNode(n *node.Node) string {
 }
 
 func (tb *Trashbin) MoveToTrash(ctx context.Context, n *node.Node, path string) error {
-	key := uuid.New().String()
+	key := n.ID
 	trashPath := trashRootForNode(n)
 
 	err := os.MkdirAll(filepath.Join(trashPath, "info"), 0755)
@@ -197,6 +197,30 @@ func (tb *Trashbin) ListRecycle(ctx context.Context, spaceID string, key, relati
 			return nil, err
 		}
 		originalPath = filepath.Join(originalPath, relativePath)
+
+		fi, err := os.Stat(base)
+		if err != nil {
+			return nil, err
+		}
+		item := &provider.RecycleItem{
+			Key:  filepath.Join(key, relativePath),
+			Size: uint64(fi.Size()),
+			Ref: &provider.Reference{
+				ResourceId: &provider.ResourceId{
+					SpaceId:  spaceID,
+					OpaqueId: spaceID,
+				},
+				Path: originalPath,
+			},
+			DeletionTime: ts,
+			Type:         provider.ResourceType_RESOURCE_TYPE_FILE,
+		}
+		if fi.IsDir() {
+			item.Type = provider.ResourceType_RESOURCE_TYPE_CONTAINER
+		} else {
+			item.Type = provider.ResourceType_RESOURCE_TYPE_FILE
+		}
+		return []*provider.RecycleItem{item}, nil
 	}
 
 	items := []*provider.RecycleItem{}
@@ -287,6 +311,10 @@ func (tb *Trashbin) RestoreRecycleItem(ctx context.Context, spaceID string, key,
 	if err != nil {
 		return nil, err
 	}
+	if id == "" {
+		return nil, errtypes.NotFound("trashbin: item not found")
+
+	}
 
 	// update parent id in case it was restored to a different location
 	_, parentID, _, err := tb.lu.MetadataBackend().IdentifyPath(ctx, filepath.Dir(restorePath))

vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/decomposedfs.go

@@ -102,6 +102,10 @@ type Session interface {
 	LockID() string
 }
 
+type IDCachingTree interface {
+	WarmupIDCache(root string, assimilate, onlyDirty bool) error
+}
+
 type SessionStore interface {
 	New(ctx context.Context) *upload.DecomposedFsSession
 	List(ctx context.Context) ([]*upload.DecomposedFsSession, error)
@@ -1304,6 +1308,11 @@ func (fs *Decomposedfs) RestoreRecycleItem(ctx context.Context, space *provider.
 			return err
 		}
 		sizeDiff = int64(treeSize)
+
+		// Warmup posix IDCache if restored path is a directory
+		if cachingTree, ok := fs.tp.(IDCachingTree); ok {
+			_ = cachingTree.WarmupIDCache(restoredNode.InternalPath(), false, false)
+		}
 	} else {
 		sizeDiff = restoredNode.Blobsize
 	}

vendor/github.com/opencloud-eu/reva/v2/pkg/storage/pkg/decomposedfs/options/options.go

@@ -135,7 +135,7 @@ func New(m map[string]interface{}) (*Options, error) {
 	o.Root = filepath.Clean(o.Root)
 
 	if o.PersonalSpaceAliasTemplate == "" {
-		o.PersonalSpaceAliasTemplate = "{{.SpaceType}}/{{.User.Username}}"
+		o.PersonalSpaceAliasTemplate = "{{.SpaceType}}/{{.User.Username | lower}}"
 	}
 
 	if o.GeneralSpaceAliasTemplate == "" {