Append namespace in putChunked method

cs3org · Oct 27, 2020 · 13a882e · 13a882e
1 parent acf5338
commit 13a882e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/http/services/owncloud/ocdav/put.go b/internal/http/services/owncloud/ocdav/put.go
@@ -135,7 +135,7 @@ func (s *svc) handlePut(w http.ResponseWriter, r *http.Request, ns string) {
 			w.WriteHeader(http.StatusBadRequest)
 		}
 		*/
-		s.handlePutChunked(w, r)
+		s.handlePutChunked(w, r, ns)
 		return
 	}
 

diff --git a/internal/http/services/owncloud/ocdav/putchunked.go b/internal/http/services/owncloud/ocdav/putchunked.go
@@ -25,6 +25,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -215,7 +216,7 @@ func (s *svc) saveChunk(ctx context.Context, path string, r io.ReadCloser) (bool
 
 	return true, assembledFileName, nil
 }
-func (s *svc) handlePutChunked(w http.ResponseWriter, r *http.Request) {
+func (s *svc) handlePutChunked(w http.ResponseWriter, r *http.Request, ns string) {
 	ctx := r.Context()
 	log := appctx.GetLogger(ctx)
 
@@ -255,7 +256,7 @@ func (s *svc) handlePutChunked(w http.ResponseWriter, r *http.Request) {
 	}
 
 	chunkInfo, _ := getChunkBLOBInfo(fn)
-	fn = chunkInfo.path
+	fn = path.Join(applyLayout(ctx, ns), chunkInfo.path)
 
 	s.handlePutHelper(w, r, fd, fn, md.Size())
-Original file line number
+Diff line change
@@ Expand Up @@
     			w.WriteHeader(http.StatusBadRequest)
     		}
     		*/
-    		s.handlePutChunked(w, r)
+    		s.handlePutChunked(w, r, ns)
     		return
     	}
@@ Expand Down @@