From 754c0fd1d95239e4c316654d5a3e46ce53b7bbec Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Tue, 14 Dec 2021 13:33:08 +0100
Subject: [PATCH] fix webdav copy for zero byte files

---
 .../fix-webdav-copy-zero-byte-file.md         |  9 ++++
 internal/http/services/owncloud/ocdav/copy.go | 53 +++++++++----------
 2 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 changelog/unreleased/fix-webdav-copy-zero-byte-file.md

diff --git a/changelog/unreleased/fix-webdav-copy-zero-byte-file.md b/changelog/unreleased/fix-webdav-copy-zero-byte-file.md
new file mode 100644
index 0000000000..2fc971cd54
--- /dev/null
+++ b/changelog/unreleased/fix-webdav-copy-zero-byte-file.md
@@ -0,0 +1,9 @@
+Bugfix: Fix webdav copy of zero byte files
+
+We've fixed the webdav copy action of zero byte files, which was not performed
+because the webdav api assumed, that zero byte uploads are created when initiating
+the upload, which was recently removed from all storage drivers. Therefore the 
+webdav api also uploads zero byte files after initiating the upload.
+
+https://github.com/cs3org/reva/pull/2374
+https://github.com/cs3org/reva/pull/2309
diff --git a/internal/http/services/owncloud/ocdav/copy.go b/internal/http/services/owncloud/ocdav/copy.go
index 8663d48c6a..eefb8d74e1 100644
--- a/internal/http/services/owncloud/ocdav/copy.go
+++ b/internal/http/services/owncloud/ocdav/copy.go
@@ -237,22 +237,21 @@ func (s *svc) executePathCopy(ctx context.Context, client gateway.GatewayAPIClie
 
 		// 4. do upload
 
-		if cp.sourceInfo.GetSize() > 0 {
-			httpUploadReq, err := rhttp.NewRequest(ctx, "PUT", uploadEP, httpDownloadRes.Body)
-			if err != nil {
-				return err
-			}
-			httpUploadReq.Header.Set(datagateway.TokenTransportHeader, uploadToken)
+		httpUploadReq, err := rhttp.NewRequest(ctx, "PUT", uploadEP, httpDownloadRes.Body)
+		if err != nil {
+			return err
+		}
+		httpUploadReq.Header.Set(datagateway.TokenTransportHeader, uploadToken)
 
-			httpUploadRes, err := s.client.Do(httpUploadReq)
-			if err != nil {
-				return err
-			}
-			defer httpUploadRes.Body.Close()
-			if httpUploadRes.StatusCode != http.StatusOK {
-				return err
-			}
+		httpUploadRes, err := s.client.Do(httpUploadReq)
+		if err != nil {
+			return err
+		}
+		defer httpUploadRes.Body.Close()
+		if httpUploadRes.StatusCode != http.StatusOK {
+			return err
 		}
+
 	}
 	return nil
 }
@@ -457,21 +456,19 @@ func (s *svc) executeSpacesCopy(ctx context.Context, w http.ResponseWriter, clie
 
 		// 4. do upload
 
-		if cp.sourceInfo.GetSize() > 0 {
-			httpUploadReq, err := rhttp.NewRequest(ctx, http.MethodPut, uploadEP, httpDownloadRes.Body)
-			if err != nil {
-				return err
-			}
-			httpUploadReq.Header.Set(datagateway.TokenTransportHeader, uploadToken)
+		httpUploadReq, err := rhttp.NewRequest(ctx, http.MethodPut, uploadEP, httpDownloadRes.Body)
+		if err != nil {
+			return err
+		}
+		httpUploadReq.Header.Set(datagateway.TokenTransportHeader, uploadToken)
 
-			httpUploadRes, err := s.client.Do(httpUploadReq)
-			if err != nil {
-				return err
-			}
-			defer httpUploadRes.Body.Close()
-			if httpUploadRes.StatusCode != http.StatusOK {
-				return err
-			}
+		httpUploadRes, err := s.client.Do(httpUploadReq)
+		if err != nil {
+			return err
+		}
+		defer httpUploadRes.Body.Close()
+		if httpUploadRes.StatusCode != http.StatusOK {
+			return err
 		}
 	}
 	return nil