Merge pull request #4582 from dragonchaser/ocis-1230-do-not-overwrite…

…-parent

Add missing returns

changelog/unreleased/check-parent-on-copy.md

@@ -2,5 +2,6 @@ Bugfix: Prevent copying a file to a parent folder
 
 When copying a file to a parent folder, the file would be copied to the parent folder, but the file would not be removed from the original folder.
 
+https://github.com/cs3org/reva/pull/4582
 https://github.com/cs3org/reva/pull/4571
 https://github.com/owncloud/ocis/issues/1230

internal/http/services/owncloud/ocdav/copy.go

@@ -562,12 +562,16 @@ func (s *svc) prepareCopy(ctx context.Context, w http.ResponseWriter, r *http.Re
 	isParent, err := s.referenceIsChildOf(ctx, s.gatewaySelector, srcRef, dstRef)
 	if err != nil {
 		switch err.(type) {
+		case errtypes.IsNotFound:
+			isParent = false
 		case errtypes.IsNotSupported:
 			log.Error().Err(err).Msg("can not detect recursive copy operation. missing machine auth configuration?")
 			w.WriteHeader(http.StatusForbidden)
+			return nil
 		default:
 			log.Error().Err(err).Msg("error while trying to detect recursive copy operation")
 			w.WriteHeader(http.StatusInternalServerError)
+			return nil
 		}
 	}
 

internal/http/services/owncloud/ocdav/move.go

@@ -166,15 +166,16 @@ func (s *svc) handleMove(ctx context.Context, w http.ResponseWriter, r *http.Req
 	if err != nil {
 		switch err.(type) {
 		case errtypes.IsNotFound:
-			w.WriteHeader(http.StatusNotFound)
+			isParent = false
 		case errtypes.IsNotSupported:
 			log.Error().Err(err).Msg("can not detect recursive move operation. missing machine auth configuration?")
 			w.WriteHeader(http.StatusForbidden)
+			return
 		default:
 			log.Error().Err(err).Msg("error while trying to detect recursive move operation")
 			w.WriteHeader(http.StatusInternalServerError)
+			return
 		}
-		return
 	}
 	if isParent {
 		w.WriteHeader(http.StatusConflict)