Fix regexp matcher of browser assets and paths (#7083)

Fix regexp matcher for special assets for the browser to clash with less of the object namespace. Assets should now be loaded with the /minio/ prefix. Previously, favicon.ico (and others) could be loaded at any path matching /minio/*/favicon.ico. This clashes with a large part of the object namespace. With this change, /minio/favicon.ico will serve the favicon but not /minio/mybucket/favicon.ico Fixes #7077
6 years ago · 042d7f25e4
parent 8c1b649b2d
commit 042d7f25e4
3 changed files with 44 additions and 41 deletions
--- a/browser/app/index.html
+++ b/browser/app/index.html
@ -5,13 +5,13 @@
        <meta charset="UTF-8">
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <title>Minio Browser</title>
-        <link rel="stylesheet" href="loader.css" type="text/css">
+        <link rel="stylesheet" href="/minio/loader.css" type="text/css">
    </head>

    <body>
        <div class="page-load">
            <div class="pl-inner">
-                <img src="logo.svg" alt="">
+                <img src="/minio/logo.svg" alt="">
            </div>
        </div>
        <div id="root"></div>
@ -51,6 +51,6 @@
        <![endif]-->

        <script>currentUiVersion = 'MINIO_UI_VERSION'</script>
-        <script src="index_bundle.js"></script>
+        <script src="/minio/index_bundle.js"></script>
    </body>
 </html>
--- a/browser/ui-assets.go
+++ b/browser/ui-assets.go
--- a/cmd/web-router.go
+++ b/cmd/web-router.go
@ -19,7 +19,6 @@ package cmd
 import (
 	"fmt"
 	"net/http"
-	"strings"

 	"github.com/elazarl/go-bindata-assetfs"
 	"github.com/gorilla/handlers"
@ -57,7 +56,7 @@ func assetFS() *assetfs.AssetFS {
 }

 // specialAssets are files which are unique files not embedded inside index_bundle.js.
-const specialAssets = ".*index_bundle.*.js$|.*loader.css$|.*logo.svg$|.*firefox.png$|.*safari.png$|.*chrome.png$|.*favicon.ico$"
+const specialAssets = "index_bundle.*.js|loader.css|logo.svg|firefox.png|safari.png|chrome.png|favicon.ico"

 // registerWebRouter - registers web router for serving minio browser.
 func registerWebRouter(router *mux.Router) error {
@ -92,21 +91,14 @@ func registerWebRouter(router *mux.Router) error {
 	webBrowserRouter.Methods("GET").Path("/download/{bucket}/{object:.+}").Queries("token", "{token:.*}").HandlerFunc(httpTraceHdrs(web.Download))
 	webBrowserRouter.Methods("POST").Path("/zip").Queries("token", "{token:.*}").HandlerFunc(httpTraceHdrs(web.DownloadZip))

-	// Add compression for assets.
-	h := http.FileServer(assetFS())
-	compressedAssets := handlers.CompressHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		idx := strings.LastIndex(r.URL.Path, slashSeparator)
-		if idx != -1 {
-			r.URL.Path = r.URL.Path[idx+1:]
-		}
-		h.ServeHTTP(w, r)
-	}))
+	// Create compressed assets handler
+	compressAssets := handlers.CompressHandler(http.StripPrefix(minioReservedBucketPath, http.FileServer(assetFS())))

 	// Serve javascript files and favicon from assets.
-	webBrowserRouter.Path(fmt.Sprintf("/{assets:%s}", specialAssets)).Handler(compressedAssets)
+	webBrowserRouter.Path(fmt.Sprintf("/{assets:%s}", specialAssets)).Handler(compressAssets)

-	// Serve index.html for rest of the requests.
-	webBrowserRouter.Path("/{index:.*}").Handler(indexHandler{http.StripPrefix(minioReservedBucketPath, h)})
+	// Serve index.html from assets for rest of the requests.
+	webBrowserRouter.Path("/{index:.*}").Handler(indexHandler{compressAssets})

 	return nil
 }