From 6118f183a04717e1837cff4f1f6d8f7cb8234652 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Wed, 23 Jun 2021 15:34:48 +0200
Subject: [PATCH] fix dav spaces copy

---
 .../grpc/services/gateway/storageprovider.go  |  3 +--
 internal/http/services/owncloud/ocdav/copy.go | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
index d719eab827..ff8efd87af 100644
--- a/internal/grpc/services/gateway/storageprovider.go
+++ b/internal/grpc/services/gateway/storageprovider.go
@@ -1191,7 +1191,6 @@ func (s *svc) stat(ctx context.Context, req *provider.StatRequest) (*provider.St
 		if err != nil || rsp.Status.Code != rpc.Code_CODE_OK {
 			return rsp, err
 		}
-
 		return rsp, nil
 	}
 
@@ -1614,7 +1613,7 @@ func (s *svc) listContainerOnProvider(ctx context.Context, req *provider.ListCon
 	if utils.IsAbsoluteReference(req.Ref) {
 		resPath := path.Clean(req.Ref.GetPath())
 		newPath := req.Ref.GetPath()
-		if resPath != "" && !strings.HasPrefix(resPath, p.ProviderPath) {
+		if resPath != "." && !strings.HasPrefix(resPath, p.ProviderPath) {
 			newPath = p.ProviderPath
 		}
 		req.Ref = &provider.Reference{Path: newPath}
diff --git a/internal/http/services/owncloud/ocdav/copy.go b/internal/http/services/owncloud/ocdav/copy.go
index d4e244886d..be7f8ad925 100644
--- a/internal/http/services/owncloud/ocdav/copy.go
+++ b/internal/http/services/owncloud/ocdav/copy.go
@@ -34,6 +34,7 @@ import (
 	"github.com/cs3org/reva/pkg/appctx"
 	"github.com/cs3org/reva/pkg/rhttp"
 	"github.com/cs3org/reva/pkg/rhttp/router"
+	"github.com/cs3org/reva/pkg/utils"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"go.opencensus.io/trace"
@@ -235,7 +236,7 @@ func (s *svc) handleSpacesCopy(w http.ResponseWriter, r *http.Request, spaceID s
 		return
 	}
 
-	sublog := appctx.GetLogger(ctx).With().Str("spaceid", spaceID).Str("path", r.URL.Path).Logger()
+	sublog := appctx.GetLogger(ctx).With().Str("spaceid", spaceID).Str("path", r.URL.Path).Str("destination", dst).Logger()
 
 	// retrieve a specific storage space
 	srcRef, status, err := s.lookUpStorageSpaceReference(ctx, spaceID, r.URL.Path)
@@ -293,7 +294,6 @@ func (s *svc) handleSpacesCopy(w http.ResponseWriter, r *http.Request, spaceID s
 func (s *svc) executeSpacesCopy(ctx context.Context, client gateway.GatewayAPIClient, src *provider.ResourceInfo, dst *provider.Reference, recurse bool) error {
 	log := appctx.GetLogger(ctx)
 	log.Debug().Str("src", src.Path).Interface("dst", dst).Msg("descending")
-
 	if src.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER {
 		// create dir
 		createReq := &provider.CreateContainerRequest{
@@ -311,7 +311,8 @@ func (s *svc) executeSpacesCopy(ctx context.Context, client gateway.GatewayAPICl
 		}
 
 		// descend for children
-		listReq := &provider.ListContainerRequest{Ref: &provider.Reference{ResourceId: src.Id}}
+		// explicitly work with relative references
+		listReq := &provider.ListContainerRequest{Ref: &provider.Reference{ResourceId: src.Id, Path: "."}}
 		res, err := client.ListContainer(ctx, listReq)
 		if err != nil {
 			return err
@@ -321,10 +322,9 @@ func (s *svc) executeSpacesCopy(ctx context.Context, client gateway.GatewayAPICl
 		}
 
 		for i := range res.Infos {
-			childPath := strings.TrimPrefix(res.Infos[i].Path, src.Path)
 			childRef := &provider.Reference{
-				ResourceId: src.Id,
-				Path:       path.Join(dst.Path, childPath),
+				ResourceId: dst.ResourceId,
+				Path:       utils.MakeRelativePath(path.Join(dst.Path, res.Infos[i].Path)),
 			}
 			err := s.executeSpacesCopy(ctx, client, res.Infos[i], childRef, recurse)
 			if err != nil {
@@ -336,8 +336,8 @@ func (s *svc) executeSpacesCopy(ctx context.Context, client gateway.GatewayAPICl
 		// copy file
 
 		// 1. get download url
-
-		dReq := &provider.InitiateFileDownloadRequest{Ref: &provider.Reference{ResourceId: src.Id}}
+		// explicitly work with relative references so that we will use the spaces datatx
+		dReq := &provider.InitiateFileDownloadRequest{Ref: &provider.Reference{ResourceId: src.Id, Path: "."}}
 
 		dRes, err := client.InitiateFileDownload(ctx, dReq)
 		if err != nil {
@@ -354,7 +354,6 @@ func (s *svc) executeSpacesCopy(ctx context.Context, client gateway.GatewayAPICl
 				downloadEP, downloadToken = p.DownloadEndpoint, p.Token
 			}
 		}
-
 		// 2. get upload url
 
 		uReq := &provider.InitiateFileUploadRequest{
@@ -392,7 +391,9 @@ func (s *svc) executeSpacesCopy(ctx context.Context, client gateway.GatewayAPICl
 		if err != nil {
 			return err
 		}
-		httpDownloadReq.Header.Set(datagateway.TokenTransportHeader, downloadToken)
+		if downloadToken != "" {
+			httpDownloadReq.Header.Set(datagateway.TokenTransportHeader, downloadToken)
+		}
 
 		httpDownloadRes, err := s.client.Do(httpDownloadReq)
 		if err != nil {