simplify fileserver path cleaning

fix typo
owncloud · Feb 23, 2022 · f9c976a · f9c976a
1 parent 07f6913
commit f9c976a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/changelog/unreleased/enhancement-web-spa-fileserver.md b/changelog/unreleased/enhancement-web-spa-fileserver.md
@@ -1,4 +1,4 @@
-Enhancement: Add SPA conform fileserver fow web
+Enhancement: Add SPA conform fileserver for web
 
 We've added an SPA conform fileserver to the web service.
 It enables web to use vue's history mode and behaves like nginx try_files.

diff --git a/web/pkg/assets/server.go b/web/pkg/assets/server.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"path"
 	"path/filepath"
-	"strings"
 )
 
 type fileServer struct {
@@ -20,12 +19,8 @@ func FileServer(root http.FileSystem) http.Handler {
 }
 
 func (f *fileServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	upath := r.URL.Path
-	if !strings.HasPrefix(upath, "/") {
-		upath = "/" + upath
-		r.URL.Path = upath
-	}
-	upath = path.Clean(upath)
+	upath := path.Clean(path.Join("/", r.URL.Path))
+	r.URL.Path = upath
 
 	asset, err := f.root.Open(upath)
 	if err != nil {