Fix accessing an OCM-shared resource containing spaces (#4171)

cs3org · Sep 8, 2023 · 7c7612e · 7c7612e
1 parent 569e0d3
commit 7c7612e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-spaces-ocm-basic-auth.md b/changelog/unreleased/fix-spaces-ocm-basic-auth.md
@@ -0,0 +1,6 @@
+Bugfix: Fix accessing an OCM-shared resource containing spaces
+
+Fixes the access of a resource OCM-shared containing spaces, that
+previously was failing with a `NotFound` error.
+
+https://github.com/cs3org/reva/pull/4171
diff --git a/internal/http/services/owncloud/ocdav/dav.go b/internal/http/services/owncloud/ocdav/dav.go
@@ -21,8 +21,8 @@ package ocdav
 import (
 	"context"
 	"net/http"
-	"net/url"
 	"path"
+	"path/filepath"
 	"strings"
 
 	gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
@@ -195,7 +195,7 @@ func (h *DavHandler) Handler(s *svc) http.Handler {
 			if ok {
 				// OCM 1.0
 				token = username
-				r.URL.Path, _ = url.JoinPath("/", token, r.URL.Path)
+				r.URL.Path = filepath.Join("/", token, r.URL.Path)
 				ctx = context.WithValue(ctx, ctxOCM10, true)
 			} else {
 				token, _ = router.ShiftPath(r.URL.Path)