Merge pull request #912 from owncloud/serve-index-html

Serve index html
owncloud · Nov 20, 2020 · b8fee3f · b8fee3f
2 parents 2069802 + 54f9505
commit b8fee3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/changelog/unreleased/pkg-serve-index-html.md b/changelog/unreleased/pkg-serve-index-html.md
@@ -0,0 +1,6 @@
+Bugfix: Serve index.html for directories
+
+The static middleware in ocis-pkg now serves index.html instead of returning 404 on paths with a trailing `/`.
+
+https://github.com/owncloud/ocis/pull/912
+https://github.com/owncloud/ocis-pkg/issues/63
diff --git a/ocis-pkg/middleware/static.go b/ocis-pkg/middleware/static.go
@@ -30,14 +30,10 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha
 			if strings.HasPrefix(r.URL.Path, path.Join(root, "api")) {
 				next.ServeHTTP(w, r)
 			} else {
-				if strings.HasSuffix(r.URL.Path, "/") {
-					http.NotFound(w, r)
-				} else {
-					w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s", strconv.Itoa(ttl)))
-					w.Header().Set("Last-Modified", lastModified)
-					w.Header().Del("Expires")
-					static.ServeHTTP(w, r)
-				}
+				w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s", strconv.Itoa(ttl)))
+				w.Header().Set("Last-Modified", lastModified)
+				w.Header().Del("Expires")
+				static.ServeHTTP(w, r)
 			}
 		})
 	}