fix upload of zero file sizes (cs3org#2055)

glpatcern · Sep 23, 2021 · 57fdecb · 57fdecb
1 parent 88ada40
commit 57fdecb
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 28 deletions.
diff --git a/changelog/unreleased/fix-zero-file-size.md b/changelog/unreleased/fix-zero-file-size.md
@@ -0,0 +1,8 @@
+Bugfix: Fix uploads of empty files
+
+This change fixes upload of empty files.
+Previously this was broken and only worked for the
+owncloud filesystem as it bypasses the semantics of the
+InitiateFileUpload call to touch a local file.
+
+https://github.com/cs3org/reva/pull/2055
diff --git a/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md b/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md
@@ -0,0 +1,18 @@
+---
+title: "nextcloud"
+linkTitle: "nextcloud"
+weight: 10
+description: >
+  Configuration for the nextcloud service
+---
+
+# _struct: config_
+
+{{% dir name="endpoint" type="string" default="" %}}
+The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/nextcloud/nextcloud.go#L48)
+{{< highlight toml >}}
+[auth.manager.nextcloud]
+endpoint = ""
+{{< /highlight >}}
+{{% /dir %}}
+
diff --git a/internal/http/services/owncloud/ocdav/put.go b/internal/http/services/owncloud/ocdav/put.go
@@ -250,39 +250,37 @@ func (s *svc) handlePut(ctx context.Context, w http.ResponseWriter, r *http.Requ
 		}
 	}
 
-	if length > 0 {
-		httpReq, err := rhttp.NewRequest(ctx, http.MethodPut, ep, r.Body)
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		httpReq.Header.Set(datagateway.TokenTransportHeader, token)
+	httpReq, err := rhttp.NewRequest(ctx, http.MethodPut, ep, r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	httpReq.Header.Set(datagateway.TokenTransportHeader, token)
 
-		httpRes, err := s.client.Do(httpReq)
-		if err != nil {
-			log.Error().Err(err).Msg("error doing PUT request to data service")
-			w.WriteHeader(http.StatusInternalServerError)
+	httpRes, err := s.client.Do(httpReq)
+	if err != nil {
+		log.Error().Err(err).Msg("error doing PUT request to data service")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	defer httpRes.Body.Close()
+	if httpRes.StatusCode != http.StatusOK {
+		if httpRes.StatusCode == http.StatusPartialContent {
+			w.WriteHeader(http.StatusPartialContent)
 			return
 		}
-		defer httpRes.Body.Close()
-		if httpRes.StatusCode != http.StatusOK {
-			if httpRes.StatusCode == http.StatusPartialContent {
-				w.WriteHeader(http.StatusPartialContent)
-				return
-			}
-			if httpRes.StatusCode == errtypes.StatusChecksumMismatch {
-				w.WriteHeader(http.StatusBadRequest)
-				b, err := Marshal(exception{
-					code:    SabredavBadRequest,
-					message: "The computed checksum does not match the one received from the client.",
-				})
-				HandleWebdavError(&log, w, b, err)
-				return
-			}
-			log.Error().Err(err).Msg("PUT request to data server failed")
-			w.WriteHeader(httpRes.StatusCode)
+		if httpRes.StatusCode == errtypes.StatusChecksumMismatch {
+			w.WriteHeader(http.StatusBadRequest)
+			b, err := Marshal(exception{
+				code:    SabredavBadRequest,
+				message: "The computed checksum does not match the one received from the client.",
+			})
+			HandleWebdavError(&log, w, b, err)
 			return
 		}
+		log.Error().Err(err).Msg("PUT request to data server failed")
+		w.WriteHeader(httpRes.StatusCode)
+		return
 	}
 
 	ok, err := chunking.IsChunked(ref.Path)