Fix the error when the user trying to overwrite a file with an empty …

…file (#4193) Co-authored-by: Roman Perekhod <[email protected]>
cs3org · Sep 18, 2023 · e1f68d0 · e1f68d0
1 parent 843fe78
commit e1f68d0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/changelog/unreleased/fix-overwrite-file.md b/changelog/unreleased/fix-overwrite-file.md
@@ -0,0 +1,5 @@
+Bugfix: fix overwrite a file with an empty file
+
+Fix the error when the user trying to overwrite a file with an empty file
+
+https://github.com/cs3org/reva/pull/4193
diff --git a/internal/http/services/owncloud/ocdav/put.go b/internal/http/services/owncloud/ocdav/put.go
@@ -172,32 +172,35 @@ func (s *svc) handlePut(ctx context.Context, w http.ResponseWriter, r *http.Requ
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-		if tfRes.Status.Code != rpc.Code_CODE_OK {
-			log.Error().Interface("status", tfRes.Status).Msg("error touching file")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		sRes, err := client.Stat(ctx, &provider.StatRequest{
-			Ref: ref,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("error sending grpc touch file request")
-			w.WriteHeader(http.StatusInternalServerError)
+		if tfRes.Status.Code == rpc.Code_CODE_OK {
+			sRes, err := client.Stat(ctx, &provider.StatRequest{
+				Ref: ref,
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("error sending grpc touch file request")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			if sRes.Status.Code != rpc.Code_CODE_OK {
+				log.Error().Interface("status", sRes.Status).Msg("error touching file")
+				errors.HandleErrorStatus(&log, w, sRes.Status)
+				return
+			}
+
+			w.Header().Set(net.HeaderETag, sRes.Info.Etag)
+			w.Header().Set(net.HeaderOCETag, sRes.Info.Etag)
+			w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*sRes.Info.Id))
+			w.Header().Set(net.HeaderLastModified, net.RFC1123Z(sRes.Info.Mtime))
+
+			w.WriteHeader(http.StatusCreated)
 			return
 		}
-		if sRes.Status.Code != rpc.Code_CODE_OK {
-			log.Error().Interface("status", sRes.Status).Msg("error touching file")
-			w.WriteHeader(http.StatusInternalServerError)
+
+		if tfRes.Status.Code != rpc.Code_CODE_ALREADY_EXISTS {
+			log.Error().Interface("status", tfRes.Status).Msg("error touching file")
+			errors.HandleErrorStatus(&log, w, tfRes.Status)
 			return
 		}
-
-		w.Header().Set(net.HeaderETag, sRes.Info.Etag)
-		w.Header().Set(net.HeaderOCETag, sRes.Info.Etag)
-		w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*sRes.Info.Id))
-		w.Header().Set(net.HeaderLastModified, net.RFC1123Z(sRes.Info.Mtime))
-
-		w.WriteHeader(http.StatusCreated)
-		return
 	}
 
 	utils.AppendPlainToOpaque(opaque, net.HeaderUploadLength, strconv.FormatInt(length, 10))