Merge pull request #5072 from cs3org/fix/eos-versions-grpc-proj

Fix for (sometimes) broken Download / Restore revisions

Author: diocas

changelog/unreleased/revisions-impersonate

@@ -0,0 +1,5 @@
+Bugfix: impersonate owner on Revisions
+
+The current implementation of Download / Restore Revisions is not consistent with ListRevisions, where we impersonate the owner in projects. We now also impersonate in the case of Download and Restore.
+
+https://github.com/cs3org/reva/pull/5072

pkg/storage/utils/eosfs/config.go

@@ -126,10 +126,6 @@ type Config struct {
 	// Only considered when EnableHome is false.
 	AllowPathRecycleOperations bool `mapstructure:"allow_path_recycle_operations"`
 
-	// Whether we should impersonate the owner of a resource when trying to perform
-	// revisions-related operations.
-	ImpersonateOwnerforRevisions bool `mapstructure:"impersonate_owner_for_revisions"`
-
 	// HTTP connections to EOS: max number of idle conns
 	MaxIdleConns int `mapstructure:"max_idle_conns"`
 

pkg/storage/utils/eosfs/eosfs.go

@@ -1464,7 +1464,7 @@ func (fs *eosfs) DownloadRevision(ctx context.Context, ref *provider.Reference,
 	var fn string
 	var err error
 
-	if !fs.conf.EnableHome && fs.conf.ImpersonateOwnerforRevisions {
+	if !fs.conf.EnableHome {
 		// We need to access the revisions for a non-home reference.
 		// We'll get the owner of the particular resource and impersonate them
 		// if we have access to it.
@@ -1475,7 +1475,8 @@ func (fs *eosfs) DownloadRevision(ctx context.Context, ref *provider.Reference,
 		fn = fs.wrap(ctx, md.Path)
 
 		if md.PermissionSet.InitiateFileDownload {
-			auth, err = fs.getUIDGateway(ctx, md.Owner)
+			user := appctx.ContextMustGetUser(ctx)
+			auth, err = fs.getEOSToken(ctx, user, fn)
 			if err != nil {
 				return nil, err
 			}
@@ -1497,7 +1498,7 @@ func (fs *eosfs) RestoreRevision(ctx context.Context, ref *provider.Reference, r
 	var fn string
 	var err error
 
-	if !fs.conf.EnableHome && fs.conf.ImpersonateOwnerforRevisions {
+	if !fs.conf.EnableHome {
 		// We need to access the revisions for a non-home reference.
 		// We'll get the owner of the particular resource and impersonate them
 		// if we have access to it.
@@ -1508,7 +1509,8 @@ func (fs *eosfs) RestoreRevision(ctx context.Context, ref *provider.Reference, r
 		fn = fs.wrap(ctx, md.Path)
 
 		if md.PermissionSet.RestoreFileVersion {
-			auth, err = fs.getUIDGateway(ctx, md.Owner)
+			user := appctx.ContextMustGetUser(ctx)
+			auth, err = fs.getEOSToken(ctx, user, fn)
 			if err != nil {
 				return err
 			}